Makefile | 15
configs/autoconf.in | 4
configs/darwin | 26
configs/default | 4
configure.ac | 8
debian/changelog | 45
debian/clean | 23
debian/control | 53
debian/libegl1-mesa-dev.install | 4
debian/libegl1-mesa-dev.install.in | 4
debian/libegl1-mesa-drivers.install | 2
debian/libegl1-mesa-drivers.install.in | 2
debian/libegl1-mesa.install | 4
debian/libegl1-mesa.install.in | 4
debian/libgl1-mesa-dev.install | 2
debian/libgl1-mesa-dev.install.in | 2
debian/libgl1-mesa-dev.links | 1
debian/libgl1-mesa-dev.links.in | 1
debian/libgl1-mesa-dri-experimental.install | 1
debian/libgl1-mesa-dri-experimental.install.in | 7
debian/libgl1-mesa-dri-i686.install | 2
debian/libgl1-mesa-dri.install | 4
debian/libgl1-mesa-dri.install.in | 4
debian/libgl1-mesa-dri.install.linux | 11
debian/libgl1-mesa-dri.install.linux.in | 10
debian/libgl1-mesa-glx-i686.install | 1
debian/libgl1-mesa-glx-i686.install.in | 1
debian/libgl1-mesa-glx.install | 1
debian/libgl1-mesa-glx.install.in | 2
debian/libgl1-mesa-glx.postinst | 26
debian/libgl1-mesa-glx.postinst.in | 31
debian/libgl1-mesa-glx.prerm | 23
debian/libgl1-mesa-glx.prerm.in | 23
debian/libgl1-mesa-swx11-dev.install | 2
debian/libgl1-mesa-swx11-dev.install.in | 2
debian/libgl1-mesa-swx11-i686.install | 2
debian/libgl1-mesa-swx11.install | 1
debian/libgl1-mesa-swx11.install.in | 1
debian/libgl1-mesa-swx11.postinst | 26
debian/libgl1-mesa-swx11.postinst.in | 31
debian/libgl1-mesa-swx11.prerm | 23
debian/libgl1-mesa-swx11.prerm.in | 23
debian/libgles1-mesa-dev.install | 3
debian/libgles1-mesa-dev.install.in | 3
debian/libgles1-mesa.install | 2
debian/libgles1-mesa.install.in | 2
debian/libgles2-mesa-dev.install | 3
debian/libgles2-mesa-dev.install.in | 3
debian/libgles2-mesa.install | 2
debian/libgles2-mesa.install.in | 2
debian/libglu1-mesa-dev.install | 6
debian/libglu1-mesa.install | 2
debian/libglw1-mesa-dev.install | 6
debian/libglw1-mesa.install | 2
debian/libopenvg1-mesa-dev.install | 3
debian/libopenvg1-mesa-dev.install.in | 3
debian/libopenvg1-mesa.install | 2
debian/libopenvg1-mesa.install.in | 2
debian/libosmesa6-dev.install | 14
debian/libosmesa6.install | 6
debian/mesa-common-dev.install | 8
debian/mesa-common-dev.install.in | 8
debian/not-installed | 4
debian/patches/116_use_shared_galliumcore.diff | 232 ++
debian/patches/117_handle_dri2connect_errors_when_indirect.diff | 34
debian/patches/series | 2
debian/rules | 58
docs/llvmpipe.html | 204 -
docs/news.html | 7
docs/relnotes.html | 1
src/gallium/auxiliary/draw/draw_pipe_clip.c | 62
src/gallium/auxiliary/draw/draw_vs.h | 3
src/gallium/auxiliary/draw/draw_vs_aos_io.c | 4
src/gallium/auxiliary/gallivm/lp_bld_misc.cpp | 27
src/gallium/auxiliary/tgsi/tgsi_ureg.c | 2
src/gallium/drivers/r300/r300_blit.c | 37
src/gallium/drivers/r300/r300_context.h | 2
src/gallium/drivers/r300/r300_emit.c | 17
src/gallium/drivers/r300/r300_render.c | 16
src/gallium/drivers/r300/r300_state.c | 16
src/gallium/drivers/r300/r300_state_derived.c | 6
src/gallium/state_trackers/wgl/stw_ext_pbuffer.c | 87
src/gallium/state_trackers/wgl/stw_framebuffer.c | 101
src/gallium/state_trackers/wgl/stw_st.c | 11
src/gallium/state_trackers/wgl/stw_st.h | 4
src/gallium/winsys/r600/drm/radeon_pciid.c | 5
src/glsl/Makefile | 8
src/glsl/ast_function.cpp | 2
src/glsl/ast_to_hir.cpp | 146 -
src/glsl/builtin_function.cpp | 2
src/glsl/glcpp/glcpp-parse.c | 2
src/glsl/glcpp/glcpp-parse.y | 2
src/glsl/glsl_parser_extras.cpp | 2
src/glx/applegl_glx.c | 45
src/glx/dri2_glx.c | 3
src/glx/glx_pbuffer.c | 2
src/glx/glxclient.h | 17
src/glx/glxcmds.c | 8
src/glx/glxcurrent.c | 6
src/glx/glxext.c | 18
src/mesa/drivers/dri/common/spantmp2.h | 122 -
src/mesa/drivers/dri/i965/brw_defines.h | 30
src/mesa/drivers/dri/i965/brw_gs.c | 52
src/mesa/drivers/dri/i965/brw_gs.h | 5
src/mesa/drivers/dri/i965/brw_gs_emit.c | 32
src/mesa/drivers/dri/i965/brw_misc_state.c | 4
src/mesa/drivers/dri/i965/gen6_cc.c | 2
src/mesa/drivers/dri/i965/gen6_clip_state.c | 2
src/mesa/drivers/dri/i965/gen6_gs_state.c | 50
src/mesa/drivers/dri/i965/gen6_sampler_state.c | 2
src/mesa/drivers/dri/i965/gen6_scissor_state.c | 2
src/mesa/drivers/dri/i965/gen6_sf_state.c | 2
src/mesa/drivers/dri/i965/gen6_urb.c | 2
src/mesa/drivers/dri/i965/gen6_viewport_state.c | 2
src/mesa/drivers/dri/i965/gen6_vs_state.c | 6
src/mesa/drivers/dri/i965/gen6_wm_state.c | 6
src/mesa/drivers/dri/intel/intel_fbo.c | 2
src/mesa/drivers/dri/intel/intel_span.c | 77
src/mesa/drivers/dri/intel/intel_tex_copy.c | 13
src/mesa/drivers/dri/r300/compiler/memory_pool.c | 2
src/mesa/drivers/dri/r300/compiler/radeon_compiler_util.c | 121 -
src/mesa/drivers/dri/r300/compiler/radeon_compiler_util.h | 6
src/mesa/drivers/dri/r300/compiler/radeon_optimize.c | 12
src/mesa/drivers/dri/radeon/radeon_chipset.h | 5
src/mesa/drivers/dri/radeon/radeon_screen.c | 5
src/mesa/drivers/osmesa/osmesa.c | 28
src/mesa/main/buffers.c | 2
src/mesa/main/depthstencil.c | 3
src/mesa/main/dlist.c | 22
src/mesa/main/fbobject.c | 108
src/mesa/main/formats.c | 4
src/mesa/main/formats.h | 2
src/mesa/main/framebuffer.c | 2
src/mesa/main/mtypes.h | 3
src/mesa/main/renderbuffer.c | 713 ++++--
src/mesa/main/renderbuffer.h | 2
src/mesa/main/shaderapi.c | 4
src/mesa/main/teximage.c | 2
src/mesa/main/texstore.c | 14
src/mesa/main/uniforms.c | 4
src/mesa/main/version.h | 4
src/mesa/program/program_parse.tab.c | 1121
+++++-----
src/mesa/program/program_parse.tab.h | 13
src/mesa/program/program_parse.y | 29
src/mesa/program/program_parse_extra.c | 10
src/mesa/program/program_parser.h | 1
src/mesa/state_tracker/st_cb_blit.c | 14
src/mesa/state_tracker/st_cb_condrender.c | 11
src/mesa/state_tracker/st_cb_drawpixels.c | 18
src/mesa/state_tracker/st_cb_fbo.c | 17
src/mesa/state_tracker/st_cb_readpixels.c | 9
src/mesa/state_tracker/st_cb_texture.c | 23
src/mesa/state_tracker/st_context.h | 4
src/mesa/state_tracker/st_gen_mipmap.c | 19
src/mesa/state_tracker/st_texture.c | 4
src/mesa/swrast/s_blit.c | 3
src/mesa/swrast/s_clear.c | 8
src/mesa/swrast/s_readpix.c | 11
src/mesa/swrast/s_span.c | 5
src/mesa/vbo/vbo_exec_api.c | 12
src/mesa/vbo/vbo_save_api.c | 11
src/mesa/vbo/vbo_save_draw.c | 20
162 files changed, 2730 insertions(+), 1863 deletions(-)
New commits:
commit 9c60d60243c4106f47b96f7284626a56ff94db9f
Author: Christopher James Halse Rogers <christopher.halse.rog...@canonical.com>
Date: Wed Jun 15 14:29:24 2011 +1000
Add some launchpad-fu to changelog
diff --git a/debian/changelog b/debian/changelog
index f008cfe..56495e5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
mesa (7.10.3-0ubuntu1) oneiric; urgency=low
* New upstream 7.10.3 bugfix release.
+ - Fixes infinite loop in GLSL compiler (LP: #788730)
* Merge with Debian unstable. Remaining Ubuntu changes:
- debian/control
+ Drop lesstif-dev from Build-Depends; it's in Universe.
commit 5529d6d2a313554ca23b035ea6ffce45813082ab
Author: Christopher James Halse Rogers <christopher.halse.rog...@canonical.com>
Date: Wed Jun 15 14:21:49 2011 +1000
Fix DRI with remote clients (LP: #785368)
diff --git a/debian/changelog b/debian/changelog
index 7c234ef..f008cfe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -70,6 +70,10 @@ mesa (7.10.3-0ubuntu1) oneiric; urgency=low
- Use multiarch dirs for our dri module search path, with a fallback to
/usr/lib/dri.
- Use the right path for dh_shlibdeps.
+ * debian/patches/117_handle_dri2connect_errors_when_indirect.diff:
+ - Handle BadRequest X protocol errors which DRI2 throws when remote
+ clients attempt to connect so that mesa can fall back to a codepath
+ that works. (LP: #785368)
-- Christopher James Halse Rogers <r...@ubuntu.com> Mon, 06 Jun 2011
16:51:56 +1000
diff --git a/debian/patches/117_handle_dri2connect_errors_when_indirect.diff
b/debian/patches/117_handle_dri2connect_errors_when_indirect.diff
new file mode 100644
index 0000000..acd65a9
--- /dev/null
+++ b/debian/patches/117_handle_dri2connect_errors_when_indirect.diff
@@ -0,0 +1,34 @@
+commit e9933f833bf336b107c2dc97bc1cc07d970cfb1c
+Author: Christopher James Halse Rogers <christopher.halse.rog...@canonical.com>
+Date: Thu Jun 9 18:52:40 2011 +1000
+
+ glx/dri2: Paper over errors in DRI2Connect when indirect
+
+ DRI2 will throw BadRequest for this when the client is not local, but
+ DRI2 is an implementation detail and not something callers should have
+ to know about. Silently swallow errors in this case, and just propagate
+ the failure through DRI2Connect's return code.
+
+ Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=28125
+ Signed-off-by: Christopher James Halse Rogers
<christopher.halse.rog...@canonical.com>
+
+diff --git a/src/glx/dri2.c b/src/glx/dri2.c
+index adfd3d1..00adff2 100644
+--- a/src/glx/dri2.c
++++ b/src/glx/dri2.c
+@@ -180,6 +180,15 @@ DRI2Error(Display *display, xError *err, XExtCodes
*codes, int *ret_code)
+ err->minorCode == X_DRI2DestroyDrawable)
+ return True;
+
++ /* If the server is non-local DRI2Connect will raise BadRequest.
++ * Swallow this so that DRI2Connect can signal this in its return code */
++ if (err->majorCode == codes->major_opcode &&
++ err->minorCode == X_DRI2Connect &&
++ err->errorCode == BadRequest) {
++ *ret_code = False;
++ return True;
++ }
++
+ return False;
+ }
+
diff --git a/debian/patches/series b/debian/patches/series
index c238057..2aca580 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -17,3 +17,4 @@
114_intel_dri_renderer_string.diff
115_llvm_dynamic_linking.diff
116_use_shared_galliumcore.diff
+117_handle_dri2connect_errors_when_indirect.diff
commit 4f9df31d6f12968fdfe69aa84b875cb7ff87193a
Author: Christopher James Halse Rogers <christopher.halse.rog...@canonical.com>
Date: Wed Jun 15 12:51:32 2011 +1000
Install libgallium on linux, rather than never. GAH!
diff --git a/debian/libgl1-mesa-dri.install.in
b/debian/libgl1-mesa-dri.install.in
index 5f39f4e..acc3c84 100644
--- a/debian/libgl1-mesa-dri.install.in
+++ b/debian/libgl1-mesa-dri.install.in
@@ -2,4 +2,3 @@
build/dri/${DEB_HOST_MULTIARCH}/*_dri.so usr/lib/${DEB_HOST_MULTIARCH}/dri
build/dri/${DEB_HOST_MULTIARCH}/libglsl.so usr/lib/${DEB_HOST_MULTIARCH}/dri
build/dri/${DEB_HOST_MULTIARCH}/libdricore.so usr/lib/${DEB_HOST_MULTIARCH}/dri
-build/dri/${DEB_HOST_MULTIARCH}/libgallium.so usr/lib/${DEB_HOST_MULTIARCH}/dri
diff --git a/debian/libgl1-mesa-dri.install.linux.in
b/debian/libgl1-mesa-dri.install.linux.in
index 3e8b5c2..3ef206d 100644
--- a/debian/libgl1-mesa-dri.install.linux.in
+++ b/debian/libgl1-mesa-dri.install.linux.in
@@ -4,6 +4,7 @@ build/dri/${DEB_HOST_MULTIARCH}/libglsl.so
usr/lib/${DEB_HOST_MULTIARCH}/dri
build/dri/${DEB_HOST_MULTIARCH}/libdricore.so usr/lib/${DEB_HOST_MULTIARCH}/dri
# This part is Linux-specific:
+build/dri/${DEB_HOST_MULTIARCH}/libgallium.so usr/lib/${DEB_HOST_MULTIARCH}/dri
build/dri/${DEB_HOST_MULTIARCH}/gallium/r300_dri.so
usr/lib/${DEB_HOST_MULTIARCH}/dri
build/dri/${DEB_HOST_MULTIARCH}/gallium/r600_dri.so
usr/lib/${DEB_HOST_MULTIARCH}/dri
build/dri/${DEB_HOST_MULTIARCH}/gallium/nouveau_dri.so
usr/lib/${DEB_HOST_MULTIARCH}/dri
commit 97312f5156c964193b2135f4de8434c409175dd9
Author: Christopher James Halse Rogers <christopher.halse.rog...@canonical.com>
Date: Wed Jun 15 12:36:26 2011 +1000
Update postinst version comparisons for real version
diff --git a/debian/libgl1-mesa-glx.postinst.in
b/debian/libgl1-mesa-glx.postinst.in
index ffe9a47..2d5bfb3 100644
--- a/debian/libgl1-mesa-glx.postinst.in
+++ b/debian/libgl1-mesa-glx.postinst.in
@@ -9,7 +9,7 @@ case "$1" in
configure)
# on upgrade from previous versions, clean up our non-arch-qualified
# alternative
- if dpkg --compare-versions "$2" lt-nl 7.10.1-0ubuntu4+multiarch.1; then
+ if dpkg --compare-versions "$2" lt-nl 7.10.3-0ubuntu1; then
update-alternatives --remove gl_conf /usr/lib/mesa/ld.so.conf
fi
# Use alternatives to make it easier to switch between Mesa and 3rd party
modules
diff --git a/debian/libgl1-mesa-swx11.postinst.in
b/debian/libgl1-mesa-swx11.postinst.in
index 95d0c0c..5279b2a 100644
--- a/debian/libgl1-mesa-swx11.postinst.in
+++ b/debian/libgl1-mesa-swx11.postinst.in
@@ -9,7 +9,7 @@ case "$1" in
configure)
# on upgrade from previous versions, clean up our non-arch-qualified
# alternative
- if dpkg --compare-versions "$2" lt-nl 7.10.1-0ubuntu4+multiarch.1; then
+ if dpkg --compare-versions "$2" lt-nl 7.10.3-0ubuntu1; then
update-alternatives --remove gl_conf /usr/lib/mesa/ld.so.conf
fi
# Use alternatives to make it easier to switch between Mesa and 3rd party
modules
commit c935a9cab59889f3d8d079f1330e60dce6071e9d
Author: Christopher James Halse Rogers <christopher.halse.rog...@canonical.com>
Date: Wed Jun 15 12:25:36 2011 +1000
Update Breaks: versions
diff --git a/debian/changelog b/debian/changelog
index a4c6883..7c234ef 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -65,9 +65,8 @@ mesa (7.10.3-0ubuntu1) oneiric; urgency=low
libgl1-mesa-glx that will look for DRI modules only in /usr/lib/dri.
- Fix up the maintainer scripts to transition to per-architecture
alternatives for ld.so configs.
- - Conflict with nvidia-current, fglrx due to the migration of alternatives
- for the ld.so.conf snippets. This should eventually be a << conflicts,
- but only once there are packages available that use the new alternative.
+ - Declare Breaks: against nvidia-current, nvidia-173, and fglrx due to the
+ migration of alternatives for the ld.so.conf snippets.
- Use multiarch dirs for our dri module search path, with a fallback to
/usr/lib/dri.
- Use the right path for dh_shlibdeps.
diff --git a/debian/control b/debian/control
index c6b9041..71cf883 100644
--- a/debian/control
+++ b/debian/control
@@ -389,9 +389,13 @@ Depends:
${shlibs:Depends},
${misc:Depends}
Recommends: libgl1-mesa-dri (>= 7.2)
-Conflicts: libgl1, libgl1-mesa-dri (<< 6.4.0), nvidia-current, fglrx
+Conflicts: libgl1, libgl1-mesa-dri (<< 6.4.0)
Replaces: libgl1, libgl1-mesa-dri (<< 6.4.0)
Provides: libgl1
+Breaks:
+ nvidia-current (<= 270.41.19-0ubuntu1),
+ nvidia-173 (<= 173.14.30-0ubuntu2),
+ fglrx (<= 2:8.850-0ubuntu1),
Pre-Depends: ${misc:Pre-Depends}
Multi-Arch: same
Description: free implementation of the OpenGL API -- GLX runtime
@@ -461,9 +465,9 @@ Replaces:
xlibmesa-dri (<< 1:7.0.0),
libgl1-mesa-dri-experimental (<< 7.10.2-2ubuntu1)
Breaks:
- xserver-xorg-core (<< 2:1.10.1-1ubuntu4),
- libgl1-mesa-glx (<< 7.10.2-2ubuntu1),
- libgl1-mesa-dri-experimental (<< 7.10.2-2ubuntu1)
+ xserver-xorg-core (<< 2:1.10.2-1ubuntu1),
+ libgl1-mesa-glx (<< 7.10.3-0ubuntu1),
+ libgl1-mesa-dri-experimental (<< 7.10.3-0ubuntu1)
Multi-Arch: same
Description: free implementation of the OpenGL API -- DRI modules
This version of Mesa provides GLX and DRI capabilities: it is capable of
@@ -506,8 +510,8 @@ Depends:
${shlibs:Depends},
${misc:Depends},
Breaks:
- xserver-xorg-core (<< 2:1.10.1-1ubuntu4),
- libgl1-mesa-glx (<< 7.10.2-2ubuntu1),
+ xserver-xorg-core (<< 2:1.10.2-1ubuntu1),
+ libgl1-mesa-glx (<< 7.10.3-0ubuntu1),
Multi-Arch: same
Description: free implementation of the OpenGL API -- Extra DRI modules
This version of Mesa provides GLX and DRI capabilities: it is capable of
commit de1252d14fa3921a62e9cc4921edcc9e2a1e708b
Author: Christopher James Halse Rogers <christopher.halse.rog...@canonical.com>
Date: Wed Jun 15 11:14:45 2011 +1000
Also clean up libgl1-mesa-dev.links on clean
diff --git a/debian/clean b/debian/clean
index 1b796bb..14fc6cc 100644
--- a/debian/clean
+++ b/debian/clean
@@ -13,6 +13,7 @@ debian/libgl1-mesa-dri.install
debian/libgl1-mesa-dri.install.linux
debian/libgl1-mesa-dri-experimental.install
debian/libgl1-mesa-dev.install
+debian/libgl1-mesa-dev.links
debian/libegl1-mesa.install
debian/libegl1-mesa-drivers.install
debian/libegl1-mesa-dev.install
commit 780de4171cd08883696da2857ca5ed7d567a282a
Author: Christopher James Halse Rogers <christopher.halse.rog...@canonical.com>
Date: Wed Jun 15 11:03:09 2011 +1000
Disable LLVM again for now, pending llvm-2.9 MIR
diff --git a/debian/changelog b/debian/changelog
index 4387083..a4c6883 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-mesa (7.10.3-0ubuntu1) UNRELEASED; urgency=low
+mesa (7.10.3-0ubuntu1) oneiric; urgency=low
* New upstream 7.10.3 bugfix release.
* Merge with Debian unstable. Remaining Ubuntu changes:
@@ -52,15 +52,10 @@ mesa (7.10.3-0ubuntu1) UNRELEASED; urgency=low
- Move r300/r600 classic drivers to -experimental. They're not supported.
Shave another ~1MB off the CD!
* debian/control:
- * debian/rules:
- - Enable LLVM support.
- * debian/control:
- Add new bison and flex build-depends.
* debian/patches/115_llvm_dynamic_linking.diff
- Dynamically link DRI drivers to libllvm. Saves ~6MiB per DRI driver.
* debian/rules:
- * debian/libgl1-mesa-dri-experimental.install.in:
- - Install llvmpipe software renderer in libgl1-mesa-dri-experimental
* debian/patches/116_use_shared_galliumcore.diff:
* debian/libgl1-mesa-dri.install.in:
- Link gallium DRI drivers against shared gallium routines to save CD
diff --git a/debian/control b/debian/control
index 7ae7c13..c6b9041 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,6 @@ Build-Depends: debhelper (>= 8.1.2ubuntu2), quilt (>= 0.40),
pkg-config,
linux-libc-dev (>= 2.6.31) [linux-any],
libx11-xcb-dev, libxcb-dri2-0-dev, libxcb-xfixes0-dev, python-libxml2,
libudev-dev [linux-any],
- llvm-2.9-dev,
flex,
bison,
Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/mesa
diff --git a/debian/libgl1-mesa-dri-experimental.install.in
b/debian/libgl1-mesa-dri-experimental.install.in
index dca53ff..6ce8544 100644
--- a/debian/libgl1-mesa-dri-experimental.install.in
+++ b/debian/libgl1-mesa-dri-experimental.install.in
@@ -1,5 +1,5 @@
build/dri/${DEB_HOST_MULTIARCH}/gallium/i915_dri.so
usr/lib/${DEB_HOST_MULTIARCH}/dri-alternates
-build/dri/${DEB_HOST_MULTIARCH}/gallium/swrastg_dri.so
usr/lib/${DEB_HOST_MULTIARCH}/dri-alternates
+#build/dri/${DEB_HOST_MULTIARCH}/gallium/swrastg_dri.so
usr/lib/${DEB_HOST_MULTIARCH}/dri-alternates
# Install the classic radeon drivers for UMS fallback
# Most users will not need these, and we don't want to support them
diff --git a/debian/rules b/debian/rules
index f82db61..ac6af8a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -69,7 +69,7 @@ ifeq ($(DEB_HOST_ARCH_OS), hurd)
confflags_GALLIUM = --disable-gallium
else
EGL_DISPLAYS = x11
- GALLIUM_DRIVERS = swrast llvm
+ GALLIUM_DRIVERS = swrast
GALLIUM_STATE_TRACKERS = egl,glx,dri,vega
ifeq ($(DEB_HOST_ARCH_OS), linux)
commit b2e9911dfb78a2975156f01cb56fbf8dea7010a5
Author: Christopher James Halse Rogers <christopher.halse.rog...@canonical.com>
Date: Wed Jun 15 09:55:04 2011 +1000
Fix shared gallium patch to build properly
diff --git a/debian/patches/116_use_shared_galliumcore.diff
b/debian/patches/116_use_shared_galliumcore.diff
index 16a802f..4c53ba8 100644
--- a/debian/patches/116_use_shared_galliumcore.diff
+++ b/debian/patches/116_use_shared_galliumcore.diff
@@ -1,7 +1,7 @@
Index: mesa/bin/mklib
===================================================================
---- mesa.orig/bin/mklib 2011-06-14 17:09:31.449526451 +1000
-+++ mesa/bin/mklib 2011-06-14 17:13:28.608853763 +1000
+--- mesa.orig/bin/mklib 2011-06-14 18:58:41.579402261 +1000
++++ mesa/bin/mklib 2011-06-14 18:59:14.110623277 +1000
@@ -147,6 +147,7 @@
NOPREFIX=0
EXPORTS=""
@@ -58,8 +58,8 @@ Index: mesa/bin/mklib
# finish up
Index: mesa/configure.ac
===================================================================
---- mesa.orig/configure.ac 2011-06-14 17:13:28.598853367 +1000
-+++ mesa/configure.ac 2011-06-14 17:13:28.618854166 +1000
+--- mesa.orig/configure.ac 2011-06-14 18:59:14.080622091 +1000
++++ mesa/configure.ac 2011-06-14 18:59:14.110623277 +1000
@@ -806,6 +806,41 @@
AC_SUBST([GLESv2_LIB_DEPS])
AC_SUBST([GLESv2_PC_LIB_PRIV])
@@ -104,8 +104,17 @@ Index: mesa/configure.ac
[AS_HELP_STRING([--enable-shared-dricore],
Index: mesa/src/gallium/Makefile.template
===================================================================
---- mesa.orig/src/gallium/Makefile.template 2011-06-14 17:09:31.519528945
+1000
-+++ mesa/src/gallium/Makefile.template 2011-06-14 17:13:28.618854166 +1000
+--- mesa.orig/src/gallium/Makefile.template 2011-06-14 18:58:41.649404860
+1000
++++ mesa/src/gallium/Makefile.template 2011-06-14 19:34:52.843035156 +1000
+@@ -30,7 +30,7 @@
+
+ ##### TARGETS #####
+
+-default: depend lib$(LIBNAME).a $(PROGS)
++default:: depend lib$(LIBNAME).a $(PROGS)
+
+ lib$(LIBNAME).a: $(OBJECTS) $(EXTRA_OBJECTS) Makefile
$(TOP)/src/gallium/Makefile.template
+ $(MKLIB) -o $(LIBNAME) -static $(OBJECTS) $(EXTRA_OBJECTS)
@@ -58,16 +58,16 @@
##### RULES #####
@@ -129,8 +138,8 @@ Index: mesa/src/gallium/Makefile.template
sinclude depend
Index: mesa/src/gallium/auxiliary/Makefile
===================================================================
---- mesa.orig/src/gallium/auxiliary/Makefile 2011-06-14 17:09:31.509528592
+1000
-+++ mesa/src/gallium/auxiliary/Makefile 2011-06-14 17:13:28.618854166
+1000
+--- mesa.orig/src/gallium/auxiliary/Makefile 2011-06-14 18:58:41.619403748
+1000
++++ mesa/src/gallium/auxiliary/Makefile 2011-06-14 18:59:14.110623277
+1000
@@ -205,6 +205,14 @@
include ../Makefile.template
@@ -146,19 +155,16 @@ Index: mesa/src/gallium/auxiliary/Makefile
indices/u_indices_gen.c: indices/u_indices_gen.py
$(PYTHON2) $< > $@
-@@ -220,3 +228,7 @@
+@@ -220,3 +228,5 @@
util/u_half.c: util/u_half.py
$(PYTHON2) util/u_half.py > $@
+
-+all: default $(TOP)/$(LIB_DIR)/libgallium.so
-+
-+.DEFAULT_GOAL := all
-\ No newline at end of file
++default:: $(TOP)/$(LIB_DIR)/libgallium.so
Index: mesa/src/gallium/targets/Makefile.dri
===================================================================
---- mesa.orig/src/gallium/targets/Makefile.dri 2011-06-14 17:09:31.559530372
+1000
-+++ mesa/src/gallium/targets/Makefile.dri 2011-06-14 17:13:28.618854166
+1000
+--- mesa.orig/src/gallium/targets/Makefile.dri 2011-06-14 18:58:41.679405971
+1000
++++ mesa/src/gallium/targets/Makefile.dri 2011-06-14 18:59:14.110623277
+1000
@@ -10,7 +10,6 @@
endif
@@ -180,8 +186,8 @@ Index: mesa/src/gallium/targets/Makefile.dri
Index: mesa/src/mesa/Makefile
===================================================================
---- mesa.orig/src/mesa/Makefile 2011-06-14 17:09:31.499528243 +1000
-+++ mesa/src/mesa/Makefile 2011-06-14 17:13:28.618854166 +1000
+--- mesa.orig/src/mesa/Makefile 2011-06-14 18:59:13.850613003 +1000
++++ mesa/src/mesa/Makefile 2011-06-14 18:59:14.110623277 +1000
@@ -30,6 +30,9 @@
ES2_GALLIUM_OBJECTS := $(addprefix $(ES2_OBJ_DIR)/, $(MESA_GALLIUM_OBJECTS))
MESA_GALLIUM_OBJECTS := $(addprefix $(MESA_OBJ_DIR)/, $(MESA_GALLIUM_OBJECTS))
@@ -214,8 +220,8 @@ Index: mesa/src/mesa/Makefile
driver_subdirs: $(MESA_LIBS) $(DRICORE_LIBS)
Index: mesa/configs/autoconf.in
===================================================================
---- mesa.orig/configs/autoconf.in 2011-06-14 17:14:41.241740406 +1000
-+++ mesa/configs/autoconf.in 2011-06-14 17:14:44.961887427 +1000
+--- mesa.orig/configs/autoconf.in 2011-06-14 18:59:13.850613003 +1000
++++ mesa/configs/autoconf.in 2011-06-14 18:59:14.110623277 +1000
@@ -110,6 +110,7 @@
DRICORE_GLSL_LIBS = @DRICORE_GLSL_LIBS@
DRICORE_LIBS = @DRICORE_LIBS@
commit e9f1b194d884e561bea5cd408901f2c8e68e64f7
Author: Christopher James Halse Rogers <christopher.halse.rog...@canonical.com>
Date: Tue Jun 14 18:30:48 2011 +1000
Don't rename swrastg to swrast; libGL now looks for swrastg after swrast
diff --git a/debian/libgl1-mesa-dri-experimental.install.in
b/debian/libgl1-mesa-dri-experimental.install.in
index b6e9f34..dca53ff 100644
--- a/debian/libgl1-mesa-dri-experimental.install.in
+++ b/debian/libgl1-mesa-dri-experimental.install.in
@@ -1,5 +1,5 @@
build/dri/${DEB_HOST_MULTIARCH}/gallium/i915_dri.so
usr/lib/${DEB_HOST_MULTIARCH}/dri-alternates
-build/dri/${DEB_HOST_MULTIARCH}/gallium/swrast_dri.so
usr/lib/${DEB_HOST_MULTIARCH}/dri-alternates
+build/dri/${DEB_HOST_MULTIARCH}/gallium/swrastg_dri.so
usr/lib/${DEB_HOST_MULTIARCH}/dri-alternates
# Install the classic radeon drivers for UMS fallback
# Most users will not need these, and we don't want to support them
diff --git a/debian/rules b/debian/rules
index eb54f48..f82db61 100755
--- a/debian/rules
+++ b/debian/rules
@@ -238,9 +238,6 @@ install: build
$(MAKE) -C $(DEB_BUILD_DIR)/$$config
DESTDIR=$(CURDIR)/debian/tmp install; \
done
$(MAKE) -C $(DEB_BUILD_DIR)/dri DESTDIR=$(CURDIR)/debian/tmp/dri install
- # Rename swrastg_dri to swrast_dri so it can be used.
- mv $(DEB_BUILD_DIR)/dri/$(DEB_HOST_MULTIARCH)/gallium/swrastg_dri.so \
- $(DEB_BUILD_DIR)/dri/$(DEB_HOST_MULTIARCH)/gallium/swrast_dri.so
for file in mesa-common-dev.install libopenvg1-mesa.install \
libopenvg1-mesa-dev.install libgles2-mesa.install \
libgles2-mesa-dev.install libgles1-mesa.install \
commit 0d0b4d9ec5835ca247d3ad42121fe5820c9e035f
Author: Christopher James Halse Rogers <christopher.halse.rog...@canonical.com>
Date: Tue Jun 14 18:23:38 2011 +1000
Add new build-depends for 7.10.3 release
diff --git a/debian/changelog b/debian/changelog
index 38e356c..4387083 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -54,6 +54,8 @@ mesa (7.10.3-0ubuntu1) UNRELEASED; urgency=low
* debian/control:
* debian/rules:
- Enable LLVM support.
+ * debian/control:
+ - Add new bison and flex build-depends.
* debian/patches/115_llvm_dynamic_linking.diff
- Dynamically link DRI drivers to libllvm. Saves ~6MiB per DRI driver.
* debian/rules:
diff --git a/debian/control b/debian/control
index b8c190a..7ae7c13 100644
--- a/debian/control
+++ b/debian/control
@@ -14,6 +14,8 @@ Build-Depends: debhelper (>= 8.1.2ubuntu2), quilt (>= 0.40),
pkg-config,
libx11-xcb-dev, libxcb-dri2-0-dev, libxcb-xfixes0-dev, python-libxml2,
libudev-dev [linux-any],
llvm-2.9-dev,
+ flex,
+ bison,
Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/mesa
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/mesa.git
Homepage: http://mesa3d.sourceforge.net/
commit 04a2fcc10b4f31216e4998f48227c1395e254184
Author: Christopher James Halse Rogers <christopher.halse.rog...@canonical.com>
Date: Tue Jun 14 18:22:50 2011 +1000
Update changelog version to 7.10.3
diff --git a/debian/changelog b/debian/changelog
index 731beff..38e356c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
-mesa (7.10.2-2ubuntu1) UNRELEASED; urgency=low
+mesa (7.10.3-0ubuntu1) UNRELEASED; urgency=low
- * Merge upstream 7.10 branch up to a10cba3a.
+ * New upstream 7.10.3 bugfix release.
* Merge with Debian unstable. Remaining Ubuntu changes:
- debian/control
+ Drop lesstif-dev from Build-Depends; it's in Universe.
commit 37c5868f2358e04e272e400f5abbf837c59f9126
Author: Christopher James Halse Rogers <christopher.halse.rog...@canonical.com>
Date: Tue Jun 14 14:04:31 2011 +1000
Add patch to extend dricore work to galllium drivers
diff --git a/debian/changelog b/debian/changelog
index fde697e..731beff 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -59,6 +59,10 @@ mesa (7.10.2-2ubuntu1) UNRELEASED; urgency=low
* debian/rules:
* debian/libgl1-mesa-dri-experimental.install.in:
- Install llvmpipe software renderer in libgl1-mesa-dri-experimental
+ * debian/patches/116_use_shared_galliumcore.diff:
+ * debian/libgl1-mesa-dri.install.in:
+ - Link gallium DRI drivers against shared gallium routines to save CD
+ space.
* Merge multiarch support branch:
- Declare Breaks: against old versions of xserver-xorg-core and
libgl1-mesa-glx that will look for DRI modules only in /usr/lib/dri.
diff --git a/debian/libgl1-mesa-dri.install.in
b/debian/libgl1-mesa-dri.install.in
index acc3c84..5f39f4e 100644
--- a/debian/libgl1-mesa-dri.install.in
+++ b/debian/libgl1-mesa-dri.install.in
@@ -2,3 +2,4 @@
build/dri/${DEB_HOST_MULTIARCH}/*_dri.so usr/lib/${DEB_HOST_MULTIARCH}/dri
build/dri/${DEB_HOST_MULTIARCH}/libglsl.so usr/lib/${DEB_HOST_MULTIARCH}/dri
build/dri/${DEB_HOST_MULTIARCH}/libdricore.so usr/lib/${DEB_HOST_MULTIARCH}/dri
+build/dri/${DEB_HOST_MULTIARCH}/libgallium.so usr/lib/${DEB_HOST_MULTIARCH}/dri
diff --git a/debian/patches/116_use_shared_galliumcore.diff
b/debian/patches/116_use_shared_galliumcore.diff
new file mode 100644
index 0000000..16a802f
--- /dev/null
+++ b/debian/patches/116_use_shared_galliumcore.diff
@@ -0,0 +1,226 @@
+Index: mesa/bin/mklib
+===================================================================
+--- mesa.orig/bin/mklib 2011-06-14 17:09:31.449526451 +1000
++++ mesa/bin/mklib 2011-06-14 17:13:28.608853763 +1000
+@@ -147,6 +147,7 @@
+ NOPREFIX=0
+ EXPORTS=""
+ ID=""
++WHOLE_ARCHIVE=""
+
+ #
+ # Parse arguments
+@@ -191,6 +192,18 @@
+ -R*)
+ DEPS="$DEPS $1"
+ ;;
++ '-Wl,-whole-archive')
++ shift
++ while [ "x$1" != "x-Wl,-no-whole-archive" ] ; do
++ if [ "x$1" = "x" ] ; then
++ echo "mklib: End of arguments reached when scanning for
-Wl,-no-whole-archive"
++ echo "mklib: Arguments to -no-whole-archive must be
terminated by -Wl,-no-whole-archive"
++ exit 1
++ fi
++ WHOLE_ARCHIVE="$WHOLE_ARCHIVE $1"
++ shift
++ done
++ ;;
+ -Wl*)
+ DEPS="$DEPS $1"
+ ;;
+@@ -271,6 +284,10 @@
+ OBJECTS=$NEWOBJECTS
+ fi
+
++if [ "x$WHOLE_ARCHIVE" != "x" ] ; then
++ OBJECTS="${OBJECTS} -Wl,-whole-archive ${WHOLE_ARCHIVE}
-Wl,-no-whole-archive"
++fi
++
+
+ #
+ # Error checking
+@@ -284,7 +301,6 @@
+ exit 1
+ fi
+
+-
+ #
+ # Debugging info
+ #
+@@ -343,6 +359,7 @@
+ fi
+
+ rm -f ${LIBNAME}
++
+ # make lib
+ ${LINK} ${OPTS} ${LDFLAGS} -o ${LIBNAME} ${OBJECTS} ${DEPS}
+ # finish up
+Index: mesa/configure.ac
+===================================================================
+--- mesa.orig/configure.ac 2011-06-14 17:13:28.598853367 +1000
++++ mesa/configure.ac 2011-06-14 17:13:28.618854166 +1000
+@@ -806,6 +806,41 @@
+ AC_SUBST([GLESv2_LIB_DEPS])
+ AC_SUBST([GLESv2_PC_LIB_PRIV])
+
++dnl Setup default DRI CFLAGS
++DRI_CFLAGS='$(CFLAGS)'
++DRI_CXXFLAGS='$(CXXFLAGS)'
++DRI_LIB_DEPS='$(TOP)/src/mesa/libmesa.a'
++MESA_MODULES='$(TOP)/src/mesa/libmesa.a'
++
++AC_ARG_ENABLE([shared-dricore],
++ [AS_HELP_STRING([--enable-shared-dricore],
++ [link DRI modules with shared core DRI routines
@<:@default=disabled@:>@])],
++ [enable_dricore="$enableval"],
++ [enable_dricore=no])
++if test "$mesa_driver" = dri ; then
++ if test "$enable_dricore" = yes ; then
++ if test "$GCC$GXX" != yesyes ; then
++ AC_MSG_WARN([Shared dricore requires GCC-compatible rpath
handling. Disabling shared dricore])
++ enable_dricore=no
++ else
++ DRICORE_GLSL_LIBS='$(TOP)/$(LIB_DIR)/libglsl.so'
++ DRICORE_LIBS='$(TOP)/$(LIB_DIR)/libdricore.so'
++ DRICORE_LIB_DEPS='-L$(TOP)/$(LIB_DIR) -Wl,-R$(DRI_DRIVER_INSTALL_DIR)
-lglsl'
++ DRI_LIB_DEPS='-L$(TOP)/$(LIB_DIR)
-Wl,-R$(DRI_DRIVER_INSTALL_DIR) -lgallium -ldricore -lglsl'
++ GALLIUM_LIB_DEPS='-lgallium'
++ DRI_CFLAGS='$(CFLAGS_NOVISIBILITY) -DUSE_DRICORE'
++ DRI_CXXFLAGS='$(CXXFLAGS_NOVISIBILITY) -DUSE_DRICORE'
++ MESA_MODULES='$(DRICORE_LIBS) $(DRICORE_GLSL_LIBS)'
++ fi
++ fi
++fi
++AC_SUBST([DRICORE_LIBS])
++AC_SUBST([DRICORE_GLSL_LIBS])
++AC_SUBST([DRICORE_LIB_DEPS])
++AC_SUBST([GALLIUM_LIB_DEPS])
++AC_SUBST([DRI_CXXFLAGS])
++AC_SUBST([DRI_CFLAGS])
++AC_SUBST([MESA_MODULES])
+
+ AC_ARG_ENABLE([shared-dricore],
+ [AS_HELP_STRING([--enable-shared-dricore],
+Index: mesa/src/gallium/Makefile.template
+===================================================================
+--- mesa.orig/src/gallium/Makefile.template 2011-06-14 17:09:31.519528945
+1000
++++ mesa/src/gallium/Makefile.template 2011-06-14 17:13:28.618854166 +1000
+@@ -58,16 +58,16 @@
+ ##### RULES #####
+
+ %.s: %.c
+- $(CC) -S $(INCLUDES) $(CFLAGS) $(LIBRARY_DEFINES) $< -o $@
++ $(CC) -S $(INCLUDES) $(DRI_CFLAGS) $(LIBRARY_DEFINES) $< -o $@
+
+ %.o: %.c
+- $(CC) -c $(INCLUDES) $(CFLAGS) $(LIBRARY_DEFINES) $< -o $@
++ $(CC) -c $(INCLUDES) $(DRI_CFLAGS) $(LIBRARY_DEFINES) $< -o $@
+
+ %.o: %.cpp
+- $(CXX) -c $(INCLUDES) $(CXXFLAGS) $(LIBRARY_DEFINES) $< -o $@
++ $(CXX) -c $(INCLUDES) $(DRI_CXXFLAGS) $(LIBRARY_DEFINES) $< -o $@
+
+ %.o: %.S
+- $(CC) -c $(INCLUDES) $(CFLAGS) $(LIBRARY_DEFINES) $< -o $@
++ $(CC) -c $(INCLUDES) $(DRI_CFLAGS) $(LIBRARY_DEFINES) $< -o $@
+
+
+ sinclude depend
+Index: mesa/src/gallium/auxiliary/Makefile
+===================================================================
+--- mesa.orig/src/gallium/auxiliary/Makefile 2011-06-14 17:09:31.509528592
+1000
++++ mesa/src/gallium/auxiliary/Makefile 2011-06-14 17:13:28.618854166
+1000
+@@ -205,6 +205,14 @@
+
+ include ../Makefile.template
+
++# Shared dricore library for classic DRI drivers
++$(TOP)/$(LIB_DIR)/libgallium.so: $(OBJECTS) $(EXTRA_OBJECTS)
++ @$(MKLIB) -o $@ -linker '$(CXX)' -ldflags '$(LDFLAGS)' \
++ -cplusplus -noprefix \
++ -install $(TOP)/$(LIB_DIR) -id
$(DRI_DRIVER_INSTALL_DIR)/$@.dylib \
++ -Wl,-whole-archive $(TOP)/src/mesa/libgalliumcore.a
-Wl,-no-whole-archive \
++ $(OBJECTS) $(EXTRA_OBJECTS)
++
+
+ indices/u_indices_gen.c: indices/u_indices_gen.py
+ $(PYTHON2) $< > $@
+@@ -220,3 +228,7 @@
+
+ util/u_half.c: util/u_half.py
+ $(PYTHON2) util/u_half.py > $@
++
++all: default $(TOP)/$(LIB_DIR)/libgallium.so
++
++.DEFAULT_GOAL := all
+\ No newline at end of file
+Index: mesa/src/gallium/targets/Makefile.dri
+===================================================================
+--- mesa.orig/src/gallium/targets/Makefile.dri 2011-06-14 17:09:31.559530372
+1000
++++ mesa/src/gallium/targets/Makefile.dri 2011-06-14 17:13:28.618854166
+1000
+@@ -10,7 +10,6 @@
+ endif
+
+ MESA_MODULES = \
+- $(TOP)/src/mesa/libmesagallium.a \
+ $(GALLIUM_AUXILIARIES)
+
+ COMMON_GALLIUM_SOURCES = \
+@@ -79,8 +78,8 @@
+ $(MKLIB) -o $@.tmp -noprefix -linker '$(CXX)' -ldflags '$(LDFLAGS)' \
+ $(OBJECTS) $(PIPE_DRIVERS) \
+ -Wl,--start-group $(MESA_MODULES) -Wl,--end-group \
+- $(DRI_LIB_DEPS) $(DRIVER_EXTRAS)
+- $(CXX) $(CFLAGS) -o $@.test
$(TOP)/src/mesa/drivers/dri/common/dri_test.o $@.tmp $(DRI_LIB_DEPS) $(LDFLAGS);
++ $(DRI_LIB_DEPS) $(GALLIUM_LIB_DEPS) $(DRIVER_EXTRAS)
++ $(CXX) $(CFLAGS) -o $@.test
$(TOP)/src/mesa/drivers/dri/common/dri_test.o $@.tmp -lgallium $(DRI_LIB_DEPS)
$(GALLIUM_LIB_DEPS) $(LDFLAGS);
+ @rm -f $@.test
+ mv -f $@.tmp $@
+
+Index: mesa/src/mesa/Makefile
+===================================================================
+--- mesa.orig/src/mesa/Makefile 2011-06-14 17:09:31.499528243 +1000
++++ mesa/src/mesa/Makefile 2011-06-14 17:13:28.618854166 +1000
+@@ -30,6 +30,9 @@
+ ES2_GALLIUM_OBJECTS := $(addprefix $(ES2_OBJ_DIR)/, $(MESA_GALLIUM_OBJECTS))
+ MESA_GALLIUM_OBJECTS := $(addprefix $(MESA_OBJ_DIR)/, $(MESA_GALLIUM_OBJECTS))
+
++DRICORE_OBJECTS := $(addprefix $(DRICORE_OBJ_DIR)/, $(MESA_OBJECTS))
++GALLIUMCORE_OBJECTS := $(addprefix $(DRICORE_OBJ_DIR)/, $(filter-out
$(MESA_OBJECTS), $(MESA_GALLIUM_OBJECTS)))
++
+ # define preprocessor flags
+ MESA_CPPFLAGS := $(API_DEFINES) $(DEFINES)
+ ES1_CPPFLAGS := -DFEATURE_ES1=1 $(DEFINES)
+@@ -106,7 +109,7 @@
+ # Default: build dependencies, then asm_subdirs, GLSL built-in lib,
+ # then convenience libs (.a) and finally the device drivers:
+ default: $(DEPENDS) asm_subdirs \
+- $(MESA_LIBS) $(ES1_LIBS) $(ES2_LIBS) $(DRICORE_LIBS) driver_subdirs
++ $(MESA_LIBS) $(ES1_LIBS) $(ES2_LIBS) $(DRICORE_LIBS) driver_subdirs
libgalliumcore.a
+
+ main/api_exec_es1.c: main/APIspec.xml main/es_generator.py
main/APIspecutil.py main/APIspec.py
+ $(PYTHON2) $(PYTHON_FLAGS) main/es_generator.py -S main/APIspec.xml -V
GLES1.1 > $@
+@@ -146,6 +149,10 @@
+ libes2gallium.a: $(ES2_GALLIUM_OBJECTS) $(GLSL_LIBS)
+ @$(MKLIB) -o es2gallium -static $(ES2_GALLIUM_OBJECTS) $(GLSL_LIBS)
+
++# Make archive of subset of core mesa object files for gallium
++libgalliumcore.a: $(GALLIUMCORE_OBJECTS)
++ @ $(MKLIB) -o galliumcore -static $(GALLIUMCORE_OBJECTS)
++
+ ######################################################################
+ # Device drivers
+ driver_subdirs: $(MESA_LIBS) $(DRICORE_LIBS)
+Index: mesa/configs/autoconf.in
+===================================================================
+--- mesa.orig/configs/autoconf.in 2011-06-14 17:14:41.241740406 +1000
++++ mesa/configs/autoconf.in 2011-06-14 17:14:44.961887427 +1000
+@@ -110,6 +110,7 @@
+ DRICORE_GLSL_LIBS = @DRICORE_GLSL_LIBS@
+ DRICORE_LIBS = @DRICORE_LIBS@
+ DRICORE_LIB_DEPS = @DRICORE_LIB_DEPS@
++GALLIUM_LIB_DEPS = @GALLIUM_LIB_DEPS@
+ EGL_PLATFORMS = @EGL_PLATFORMS@
+ EGL_CLIENT_APIS = @EGL_CLIENT_APIS@
+
diff --git a/debian/patches/series b/debian/patches/series
index e4355eb..c238057 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -16,3 +16,4 @@
113_fix_tls.diff
114_intel_dri_renderer_string.diff
115_llvm_dynamic_linking.diff
+116_use_shared_galliumcore.diff
commit 2d0fd0703727b7eb2590cb887b1efb0aff43a2da
Author: Ian Romanick <ian.d.roman...@intel.com>
Date: Mon Jun 13 16:10:26 2011 -0700
docs: Add change log to 7.10.3 release notes
diff --git a/docs/relnotes-7.10.3.html b/docs/relnotes-7.10.3.html
index aeb20b5..423d89a 100644
--- a/docs/relnotes-7.10.3.html
+++ b/docs/relnotes-7.10.3.html
@@ -89,7 +89,210 @@ tbd
git log mesa-7.10.2..mesa-7.10.3
</pre>
-<p><em>Note:</em> Reverted commits and the reverts are not included in this
list.</p>
+<p>Alan Hourihane (1):
+<ul>
+ <li>Check for out of memory when creating fence</li>
+</ul></p>
+
+<p>Alex Buell (1):
+<ul>
+ <li>configure: bump LIBDRM_REQUIRED to 2.4.24</li>
+</ul></p>
+
+<p>Alex Deucher (2):
+<ul>
+ <li>r600c: add new pci ids</li>
+ <li>r600g: add new pci ids</li>
+</ul></p>
+
+<p>Brian Paul (19):
+<ul>
+ <li>docs: add link to 7.10.2 release notes</li>
+ <li>scons: remove dangling reference to state_trackers/python/SConscript</li>
+ <li>Makefile: add missing Scons files</li>
+ <li>llvmpipe: document issue with LLVM 2.8 and earlier with AVX</li>
+ <li>docs: replace llvmpipe/README with docs/llvmpipe.html</li>
+ <li>glsl: add static qualifier to silence warning</li>
+ <li>glsl: add cast to silence signed/unsigned comparison warning</li>
+ <li>mesa: s/height/depth/ in texsubimage()</li>
+ <li>mesa: fix void pointer arithmetic warnings</li>
+ <li>mesa: add some missing GLAPIENTRY keywords</li>
+ <li>mesa: check that flex/bison are installed</li>
+ <li>st/mesa: fix incorrect texture level/face/slice accesses</li>
+ <li>draw: fix edge flag handling in clipper (for unfilled
tris/quads/polygons)</li>
+ <li>vbo: check array indexes to prevent negative indexing</li>
+ <li>vbo: remove node->count > 0 test in
vbo_save_playback_vertex_list()</li>
+ <li>st/mesa: fix software accum buffer format bug</li>
+ <li>mesa: add include/c99/inttypes.h include/c99/stdbool.h
include/c99/stdint.h files to tarballs</li>
+ <li>docs: 7.10.3 release notes skeleton file, links</li>
+ <li>mesa: bump version to 7.10.3</li>
+</ul></p>
+
+<p>Carl Worth (2):
+<ul>
+ <li>glcpp: Simplify calling convention of parser's active_list functions</li>
+ <li>glcpp: Fix attempts to expand recursive macros infinitely (bug
#32835).</li>
+</ul></p>
+
+<p>Dave Airlie (1):
+<ul>
+ <li>st/mesa: fix compressed mipmap generation.</li>
+</ul></p>
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1qwo2t-0001e8...@vasks.debian.org
