From 089e2e656cb70d4c3f6b73bbd3feff103889f3ad Mon Sep 17 00:00:00 2001 From: Julien Cristau Date: Tue, 29 Dec 2009 10:17:41 +0000 Subject: Bump changelogs --- ChangeLog | 627 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ debian/changelog | 7 + 2 files changed, 634 insertions(+) diff --git a/ChangeLog b/ChangeLog index ce344764d94..a9b909783f3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,630 @@ +commit da876fa3a5df77763fe106b5e0a17b2e672a506c +Author: Brian Paul +Date: Sun Dec 27 15:14:25 2009 -0700 + + docs: insert 7.6.1 release date + +commit 331e910b5c4b2d2c940991e11027fa8f7dee0e8b +Author: Vinson Lee +Date: Sat Dec 26 16:22:25 2009 -0800 + + gallium/util: Remove comma at end of enumerator list. + +commit 3c2fd1bae0009ea8231cd77001595f27d6171f7b +Author: Vinson Lee +Date: Sat Dec 26 16:18:47 2009 -0800 + + rbug: Remove comma at end of enumerator list. + +commit f8ca25e02faa094218e741af041464728347574f +Author: Vinson Lee +Date: Sat Dec 26 16:14:39 2009 -0800 + + rbug: Remove comma at end of enumerator list. + +commit fc11424bcded0b1cea0acf45936c4af1f1a4b85b +Author: Vinson Lee +Date: Sat Dec 26 16:09:41 2009 -0800 + + mesa: Remove comma at end of enumerator list. + +commit 309c156bae59124be17137d0f559d2c054231f7c +Author: Vinson Lee +Date: Sat Dec 26 15:55:38 2009 -0800 + + i915: Fix assert. + +commit e81fe088f447b959b354fadf0d73fcc7ac7c468d +Author: Vinson Lee +Date: Sat Dec 26 01:08:26 2009 -0800 + + progs/demos: Silence warn_unused_result warnings. + +commit cdc69e34694a16e9f762aba45d7eba05e9dc8514 +Author: Vinson Lee +Date: Fri Dec 25 23:13:50 2009 -0800 + + progs/util: Silence warn_unused_result warnings. + +commit cd59e6f553ed0585f9d1a361adab007ede9aa0f6 +Author: Vinson Lee +Date: Fri Dec 25 22:34:35 2009 -0800 + + intel: Silence implicit function declaration warning. + +commit 67a4abcc3b9daabdf873d750e689893fcc94e4d5 +Author: Vinson Lee +Date: Fri Dec 25 14:23:10 2009 -0800 + + glu/sgi: Fix include recursion. + + arcsorter.h should not include itself. + +commit 2447786ed00a19466c9cc9b9efbfa084e88114eb +Author: Vinson Lee +Date: Thu Dec 24 22:58:05 2009 -0800 + + i965: Fix assert. + +commit f5ad1d0d02cae06bff3ee120c75ad4ab458d2c7d +Author: Vinson Lee +Date: Thu Dec 24 16:26:09 2009 -0800 + + i965: Add missing va_end. + +commit 098f10c2709a33bb5f35d52a42818ce7cbcaadb5 +Author: Vinson Lee +Date: Wed Dec 23 18:00:06 2009 -0800 + + glsl: Initialize member a_obj of struct slang_operation. + +commit 261c3cd530437362f906ef78459ffda7ab2b2077 +Author: Vinson Lee +Date: Wed Dec 23 17:50:02 2009 -0800 + + glu/sgi: Initialize variable in directedLine. + +commit 520955a0cd16d29ddae194ff7efc262b0d5a4fc4 +Author: Vinson Lee +Date: Wed Dec 23 16:22:03 2009 -0800 + + gallium/util: Initialize variable in util_clear. + +commit 6138145b350d9e58725b43162680b43904497ec8 +Author: Vinson Lee +Date: Wed Dec 23 16:11:10 2009 -0800 + + glu/sgi: Silence compiler warnings. + +commit 51dcea2aac08ed68b713de0a741c782d51a5b916 +Author: Vinson Lee +Date: Wed Dec 23 15:19:45 2009 -0800 + + util: Ensure debug_dump_flags generates a null-terminated string. + +commit 2ea061509ddab9054514ad87f28de950fb30dba1 +Author: Vinson Lee +Date: Wed Dec 23 14:52:06 2009 -0800 + + st/xorg: Use C-style comments. + +commit 15ecd0337e4e4d9d33449bdff014a634e368c7d6 +Author: Vinson Lee +Date: Wed Dec 23 14:43:53 2009 -0800 + + st/vega: Move declaration outside for loop. + +commit 1b0ab3e3c9bd1a57069657bf5126ade2d8d44d30 +Author: Vinson Lee +Date: Wed Dec 23 14:18:11 2009 -0800 + + st/egl: Use C-style comments. + +commit 6c8c1ce78b59f76c4a4e0c354f74e6dfb5615e8a +Author: Vinson Lee +Date: Wed Dec 23 14:09:36 2009 -0800 + + glx: Add XF86DRI[Open|Close]FullScreen prototypes to xf86dri.h. + +commit cf3bb0cf315a761210a0b3bf426aa6f30024fac3 +Author: Vinson Lee +Date: Wed Dec 23 12:42:38 2009 -0800 + + glx: Move declaration outside for loop. + +commit 57b5ca5d11044d06f8969d54ff01c27ff44585ac +Author: Vinson Lee +Date: Tue Dec 22 23:07:00 2009 -0800 + + glu/sgi: Silence uninitialized variable warnings. + +commit 19a40524d3d6f8d4a2371d8335667b57e6fb0c22 +Author: Vinson Lee +Date: Tue Dec 22 18:21:41 2009 -0800 + + Add gallium to darwin config. + +commit aae32df718cbbe5bb561d3e0589b26c8b9306563 +Author: Vinson Lee +Date: Tue Dec 22 17:51:58 2009 -0800 + + xlib: Use C-style comments. + +commit b20382d477b7454922af56c455b555d9e904cdc4 +Author: Vinson Lee +Date: Tue Dec 22 17:34:39 2009 -0800 + + trace: Silence uninitialized variable warnings. + +commit f6ca26e5a7ad0dddf7990aa2a3420ff0f1cc93aa +Author: Vinson Lee +Date: Tue Dec 22 17:17:28 2009 -0800 + + trace: Add PIPE_OS_APPLE. + +commit 6ce28a755c3d9d2da55eb764bae4205cbd659a03 +Author: Vinson Lee +Date: Tue Dec 22 16:23:00 2009 -0800 + + gallium/util: Add PIPE_OS_APPLE to u_stream_stdc.c. + +commit 5e73bcb396a313c7a1a0f8852e9e7adddefea8a1 +Author: Vinson Lee +Date: Tue Dec 22 15:59:50 2009 -0800 + + gallium/util: Add PIPE_OS_APPLE to u_network. + +commit fb8bff341e6ceae25327f152d197f74d11432f22 +Author: Vinson Lee +Date: Tue Dec 22 15:19:48 2009 -0800 + + i915g: Use C-style comment. + +commit cf02484fb668ca20afb8e426b44dc01397d83f87 +Author: Vinson Lee +Date: Tue Dec 22 14:51:12 2009 -0800 + + glx: Compile dri2.c only if GLX_DIRECT_RENDERING is defined. + +commit c1033299e836e6a52bcd7211edb263900576e6af +Author: Vinson Lee +Date: Tue Dec 22 14:28:40 2009 -0800 + + ffb: Silence compiler warnings. + +commit e9b5ed1c13e64f1da0770bce08456ed44d6bb53a +Author: Ian Romanick +Date: Mon Dec 21 18:32:32 2009 -0800 + + Add MD5 checksums for 7.6.1 release + +commit 75ad099d3cecc64fe04477ca84bf58b7720edf28 +Author: Ian Romanick +Date: Mon Dec 21 18:25:30 2009 -0800 + + mesa: set version string to 7.6.1 + +commit 982acbddab536ab16b340243d2034abfb30dfe59 +Author: Vinson Lee +Date: Sat Oct 10 10:45:16 2009 -0600 + + progs/perf: Fix MSVC build. + (cherry picked from commit cbf46ed670ef5a5c8a641730234dd7ae964c3170) + +commit 09415ca234d18d4daf257afc0ced52687fdf43a8 +Author: José Fonseca +Date: Thu Sep 24 12:36:11 2009 +0100 + + mesa: Fix missing finite symbol error on Windows. + + Caused by some weird logic regarding the __WIN32__ define which made + the finite definition dependent on the header include order. + (cherry picked from commit 622bdecabd73167d2f2f3aff0e223a8c64433f99) + +commit de7021b71c1920eeb181d430f2ae2463f964d7cf +Author: Michal Krol +Date: Mon Sep 7 09:31:17 2009 +0200 + + mesa: Include only when one is available. + (cherry picked from commit 970823978c2f7d2cf0757aa6ddbd6289b34c476f) + +commit 2b7b2b90e3fb52306c10f62e2a56f5199028d862 +Author: Vinson Lee +Date: Mon Dec 21 17:25:03 2009 -0800 + + scons: Define _USE_MATH_DEFINES on MSVC. + +commit e46ad402f1fecf0fc8d2538eb5abbdde97484799 +Author: Fabio Pedretti +Date: Tue Dec 22 10:43:35 2009 +1000 + + configure.ac: fix for libdrm_radeon API changes. + +commit 9373287a1b6ddb7b96ee10220d282a0f11ae24a2 +Author: Dave Airlie +Date: Thu Dec 17 14:29:04 2009 +1000 + + radeon/r600: use new libdrm_radeon api + +commit 9d2910ee0fd2d8ef95c6948598f702bf5a9e0d44 +Author: Dave Airlie +Date: Thu Dec 17 14:19:27 2009 +1000 + + radeon: drop assert accessing cref which is meant to be hidden + +commit 43d872730172aa44139c031555e792958865b905 +Author: Dave Airlie +Date: Thu Dec 17 14:18:54 2009 +1000 + + radeon: drop unused members of radeon_state. + +commit 1703628011242a9f1c664e67eabe8d4370a39b31 +Author: Dave Airlie +Date: Thu Dec 17 14:23:08 2009 +1000 + + r600: move structs for legacy cmdbuf into cmdbuf C file. + + these really shouldn't be exposed here + +commit 07b54fe35b93ccfd9eebd2cebe637c20044200f2 +Author: Vinson Lee +Date: Mon Dec 21 15:20:01 2009 -0800 + + progs/redbook: Silence compiler warnings. + +commit 753f0a1dea6c304eb3cc5a3db5f24a5801e37a55 +Author: Dave Airlie +Date: Mon Dec 21 10:21:28 2009 +1000 + + r600: fix glFrontFace(GL_CW) + + fd.o bug #25290 + + Suggested fix from Rafael Monica + +commit ace937f1651c64d7fb22917489e29761130aaa0d +Author: Younes Manton +Date: Sun Dec 20 20:11:55 2009 -0500 + + st/mesa: Check for single level mipmap trees. + + The assert in util_gen_mipmap() caught it, although + it does the right thing anyway. + +commit b96a5df5141390b5cb31c0eac6449239c6cb750e +Author: Jeremy Huddleston +Date: Sun Dec 20 21:34:27 2009 -0800 + + darwin: mklib: Use lipo rather than file to figure out architectures of object files + (cherry picked from commit ad7f9d71e22fb7667c90dbbc0558939b89a45154) + +commit f926eff263739183b2f0dd8aca32015625eb4b4c +Author: Jeremy Huddleston +Date: Sun Dec 20 21:32:35 2009 -0800 + + darwin: Cleanup CPPFLAGS a bit + (cherry picked from commit 4a1e103858a1db0fb037891b8d4a9426eff32b98) + +commit 0dd951387405fc67b93c675d6a462ce020504719 +Author: Vinson Lee +Date: Sun Dec 20 01:01:00 2009 -0800 + + progs/tests: Silence compiler warnings. + +commit d87d71036cf546488981d3bd174fde967533bad2 +Author: Vinson Lee +Date: Sat Dec 19 00:28:01 2009 -0800 + + progs/trivial: Use C-style comments. + +commit 3340fd65fba8bbd426c5e0b74b1d8f1592b36499 +Author: Vinson Lee +Date: Sat Dec 19 00:00:56 2009 -0800 + + progs/xdemos: Use C-style comment. + +commit 695adf41e24a16599e004fe539928ab04a9fa62e +Author: Vinson Lee +Date: Fri Dec 18 23:46:14 2009 -0800 + + progs/demos: Silence compiler warning in morph3d.c. + +commit 121ff55d81f3bff1c298ed84b2dc2d82fd572b0e +Author: Vinson Lee +Date: Fri Dec 18 23:38:15 2009 -0800 + + progs/glsl: Use C-style comments. + +commit 41377942d321c6ff858a81241f01f9c15f9ca347 +Author: Vinson Lee +Date: Fri Dec 18 23:34:28 2009 -0800 + + progs/demos: Use C-style comment. + +commit 0478b745fe72360ce91988636b54f6e4834c1fae +Author: Brian Paul +Date: Fri Dec 18 11:57:15 2009 -0700 + + glsl: clear out shader code before compiling + + When we start compiling a shader, first free the existing gl_program. + This (mostly) fixes the piglit glsl-reload-source test. + Without this change, we were actually appending the new GPU code + onto the previous program. + +commit 20ee275974a58cd221031d522ad58a9548af2a31 +Author: Alex Deucher +Date: Wed Dec 16 16:18:22 2009 -0500 + + r600: Invert front face winding when rendering to FBO + + fixes fdo bug 25679 + + Signed-off-by: Alex Deucher + +commit aeea8a07b8a3d126f62395c7f7de4fcab741846a +Author: Ian Romanick +Date: Wed Dec 16 09:01:58 2009 -0800 + + mesa: set version string to 7.6.1-rc4 + +commit 8a09e6e2ad9676c69cc4bb33459ebd4cbc9c982b +Author: Brian Paul +Date: Wed Dec 16 10:39:17 2009 -0700 + + mesa: add missing semicolon + + See bug 25663. + +commit 35ff190a9c80988ffeb0fbe4e2b5d732f8130feb +Author: Brian Paul +Date: Wed Dec 16 08:17:43 2009 -0700 + + docs: document 7.6.1 BlueGene fixes + +commit 138d639ec9d4454c646d94701365e25630d9f3da +Author: Brian Paul +Date: Wed Dec 16 08:04:23 2009 -0700 + + mesa: test for __blrts for CPU_TO_LE32() + + See bug 25663. + +commit a43fc39585c0d712244bbac5461e62f3a261d930 +Author: Brian Paul +Date: Wed Dec 16 08:02:52 2009 -0700 + + mesa: no dlopen on BlueGene + + See bug 25663. + +commit 6f202b53b049a3d6478fee6edb0a272cd779987e +Author: Brian Paul +Date: Wed Dec 16 07:58:42 2009 -0700 + + mesa: remove //-style comments + +commit ddfc2e74390d0c1df10da39112a6913ea518d349 +Author: Brian Paul +Date: Wed Dec 16 07:58:31 2009 -0700 + + st/mesa: remove //-style comments + +commit dc0a1ebc7369da62c2dfbd5ea8dec3273e099725 +Author: Vinson Lee +Date: Tue Dec 15 17:39:30 2009 -0800 + + unichrome: Silence compiler warnings. + +commit a60457b03b4549808de63457485fe9eb00b9fee5 +Author: Vinson Lee +Date: Tue Dec 15 17:06:01 2009 -0800 + + sis: Silence compiler warnings. + +commit 7e3825abdb53c791633ee85ed544ac1cbe1a65e6 +Author: Vinson Lee +Date: Tue Dec 15 16:32:51 2009 -0800 + + savage: Silence compiler warnings. + +commit ca02109e91ce7aab76eaea93d41ca98dfea22a36 +Author: Vinson Lee +Date: Tue Dec 15 13:12:12 2009 -0800 + + r128: Silence uninitialized variable warnings in r128_tris.c. + +commit 7430c3ac35ed47227c47f8f5ed184e6e754ea5e7 +Author: Vinson Lee +Date: Tue Dec 15 13:04:25 2009 -0800 + + dri: Initialize variable in driBindContext. + +commit f23d01e726a57cd6b8e31f1049ee5853773df7ea +Author: Ian Romanick +Date: Tue Dec 15 12:14:04 2009 -0800 + + intel: Fallback to software if drawable size is > MaxRenderbufferSize + + This prevents the mystery blank window if, for example, glxgears is + resized larger than 2048 wide on 915. Since the Intel drivers in Mesa + 7.6 lack GTT mapped fallbacks, the performance is a slideshow at + best. On Mesa 7.7 and later the performance is much better. + +commit 987e9188d25e7c49eb7e6fe64dbe63dd2cfc25ef +Author: Vinson Lee +Date: Tue Dec 15 12:32:48 2009 -0800 + + x86: ifdef out unused function cptr. + +commit 22d2547ad1cac1f91e839f646918ef7df6293ae9 +Author: Matthew Bell +Date: Mon Dec 14 21:58:19 2009 -0700 + + mesa: Add missing $(DESTDIR) support to src/gallium/winsys/xlib/Makefile + +commit 0a8d508854c6dd354e611b046e375b8633059a40 +Author: Vinson Lee +Date: Mon Dec 14 18:11:57 2009 -0800 + + progs/trivial: Silence compiler warnings. + +commit 6e5fe39f5051bb758b98ed4b9a2b9d550b588edf +Author: Vinson Lee +Date: Mon Dec 14 17:30:15 2009 -0800 + + mga: Silence uninitialized variable warnings. + +commit b18fa9f44810cde45519368170a505cdd0ebb936 +Author: Vinson Lee +Date: Mon Dec 14 17:20:34 2009 -0800 + + mach64: Silence uninitialized variable warnings. + +commit 6c9870b54c1aad42ead5b2655c19c42343b8bf84 +Author: Vinson Lee +Date: Sun Dec 13 00:14:31 2009 -0800 + + i810: Silence uninitialized variable warnings in i180tris.c + +commit 555dc25c4c5a0991fb6846ccc263a195717512de +Author: Vinson Lee +Date: Sat Dec 12 23:47:32 2009 -0800 + + swrast: Silence uninitialized variable warnings in s_triangle.c + +commit aa44efb04504fb6f8a1a2ff9d99388d173f7181a +Author: Vinson Lee +Date: Sat Dec 12 22:17:16 2009 -0800 + + st/mesa: Silence uninitialized variables warnings in st_draw.c. + +commit 0aef54ba627c748a43f601228c725f5ba79be002 +Author: Vinson Lee +Date: Sat Dec 12 22:00:19 2009 -0800 + + swrast: Silence uninitialized variable warnings in ss_tritmp.h. + +commit 89d85e8170e38e04790a2c10541dec01fee9afd2 +Author: Vinson Lee +Date: Sat Dec 12 21:46:13 2009 -0800 + + glut: Prevent potential double free in menuVisualSetup. + +commit 20590b97336c4ebe5d2bcee51d66820e1e5d26c8 +Author: Vinson Lee +Date: Sat Dec 12 20:20:02 2009 -0800 + + t_dd_dmatmp.h: Silence unused value warning in render_poly_elts. + +commit cd1a09e3bbdb907e3b806e68400804310dc168ce +Author: Vinson Lee +Date: Sat Dec 12 18:42:18 2009 -0800 + + glsl: Initialize member label of struct slang_operation to NULL. + +commit f8d4ac56f7596613730fa4961d9b7b2e8d042055 +Author: Vinson Lee +Date: Sat Dec 12 18:34:15 2009 -0800 + + softpipe: Initialize source in blend_quad. + +commit 7ea452dd35ba8ae063c70cc7fc916975c823ecd6 +Author: Vinson Lee +Date: Sat Dec 12 16:56:07 2009 -0800 + + t_dd_dmatmp2.h: Silence unused value warnings. + +commit 75e8dbb2351c6bdbda0e5eaefdf434a7a5518c75 +Author: Vinson Lee +Date: Sat Dec 12 16:24:25 2009 -0800 + + i915g: Silence unused value warning in intel_drm_get_device_id. + +commit 9dc018618d024cfbf1f342b0141bb6aab21f41b1 +Author: Vinson Lee +Date: Sat Dec 12 16:18:08 2009 -0800 + + t_dd_dmatmp.h: Silence unused value warnings in render_line_loop_elts. + +commit af4e4a73f78cb5ccb5b0295a4683b2eae5325d8f +Author: Vinson Lee +Date: Sat Dec 12 16:02:09 2009 -0800 + + t_dd_dmatmp.h: Silence unused value warning in render_tri_fan_elts. + +commit 588e9f69c4994d4e5bccdc8257a5aeb1e0b740d8 +Author: Vinson Lee +Date: Sat Dec 12 15:47:17 2009 -0800 + + progs/trivial: Silence compiler warnings in tri-blend-min.c. + +commit de9132f2740d3959af548e36e9b280e9853e59b6 +Author: Vinson Lee +Date: Sat Dec 12 15:27:30 2009 -0800 + + t_dd_dmatmp.h: Silence unused value warning in render_poly_verts. + +commit 1e444c9960b18bcee5216a49db997b1c5ec14eca +Author: Vinson Lee +Date: Sat Dec 12 15:08:01 2009 -0800 + + swrast: Initialize tex_coords in handle_sample_op. + +commit c1d361bd0b3570811ca4e49d09d3282aaa5cbe01 +Author: Vinson Lee +Date: Sat Dec 12 14:41:35 2009 -0800 + + t_dd_dmatmp.h: Silence unused value warning in render_quads_verts. + +commit 786899f1532046526bcc94683112d79a5f59a660 +Author: Vinson Lee +Date: Sat Dec 12 14:20:17 2009 -0800 + + progs/trivial: Silence compiler warnings in tri-blend-max.c + +commit 7d529736b9a07ddd5d8127c56cc25e5f6f5f2c12 +Author: Vinson Lee +Date: Sat Dec 12 13:39:39 2009 -0800 + + t_dd_dmatmp.h: Silence unused value warning in render_tri_fan_verts. + +commit c2cee7741e877bb78480eae8b8b5bfb55b42158c +Author: Vinson Lee +Date: Sat Dec 12 12:52:02 2009 -0800 + + t_dd_dmatmp.h: Silence unused value warning in render_line_loop_verts. + +commit 15c6558a2e6b613a6a058bb7f23b678a32e01846 +Author: Vinson Lee +Date: Sat Dec 12 02:06:51 2009 -0800 + + progs/xdemos: Silence compiler warnings in glxinfo.c. + +commit d5be33477e4a5cb73a5ccc24c2ad6518adddeb40 +Author: Vinson Lee +Date: Sat Dec 12 01:34:33 2009 -0800 + + progs/tests: Silence compiler warnings in vpeval.c. + +commit 44d6ab6de5d5c02c38146086d3f03523968df49e +Author: Vinson Lee +Date: Sat Dec 12 01:11:56 2009 -0800 + + progs/tests: Silence compiler warnings in cva.c. + +commit 9e2eee4ab203773fa4b420d3782f0074f5b3bf32 +Author: Vinson Lee +Date: Sat Dec 12 01:02:16 2009 -0800 + + progs/redbook: Silence compiler warnings in aaindex.c. + +commit 81dcf8bdf23250dc04dd60994aaede0eb5c2dda7 +Author: Vinson Lee +Date: Sat Dec 12 00:33:42 2009 -0800 + + t_dd_dmatmp.h: Silence unused value warning in render_line_loop_verts. + commit 7d41b4248bee1d926646ef5fdff07da4f9026589 Author: Brian Paul Date: Fri Dec 11 09:41:34 2009 -0700 diff --git a/debian/changelog b/debian/changelog index 8532d1d229c..34574704bdd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +mesa (7.6.1-1) UNRELEASED; urgency=low + + * New upstream release + + Pull upstream mesa_7_6_branch up to commit da876fa3 + + -- Julien Cristau Tue, 29 Dec 2009 10:16:43 +0000 + mesa (7.6.1~rc3-1) unstable; urgency=low * New upstream release candidate. -- cgit v1.2.3 From fabfd3eacac820672788c6514ba0fa2d74eba329 Mon Sep 17 00:00:00 2001 From: Julien Cristau Date: Tue, 29 Dec 2009 10:19:48 +0000 Subject: Bump linux-libc-dev build-dep to 2.6.31 for the r600 dri driver fixes ftbfs on mips --- debian/changelog | 2 ++ debian/control | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 34574704bdd..bda7ce89cef 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,8 @@ mesa (7.6.1-1) UNRELEASED; urgency=low * New upstream release + Pull upstream mesa_7_6_branch up to commit da876fa3 + * Bump linux-libc-dev build-dep to 2.6.31 for the r600 dri driver (fixes + ftbfs on mips). -- Julien Cristau Tue, 29 Dec 2009 10:16:43 +0000 diff --git a/debian/control b/debian/control index ef55b7aa477..b085b09cf78 100644 --- a/debian/control +++ b/debian/control @@ -9,7 +9,7 @@ Build-Depends: debhelper (>= 6.0.7), quilt (>= 0.40), pkg-config, x11proto-gl-dev (>= 1.4.8), libxxf86vm-dev, libexpat1-dev, lesstif2-dev, dpkg-dev (>= 1.13.19), libxfixes-dev, libxdamage-dev, libxext-dev, autoconf, automake, x11proto-dri2-dev (>= 1.99.3), - linux-libc-dev (>= 2.6.29) [!hurd-i386 !kfreebsd-amd64 !kfreebsd-i386] + linux-libc-dev (>= 2.6.31) [!hurd-i386 !kfreebsd-amd64 !kfreebsd-i386] 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/ -- cgit v1.2.3 From bc94d4825916cd640ccb7d1ac3f5315ac9ac90ad Mon Sep 17 00:00:00 2001 From: Julien Cristau Date: Tue, 29 Dec 2009 10:40:05 +0000 Subject: Update patch stack Drop hunk from 05_hurd-ftbfs.diff that was applied upstream. Refresh other patches. --- debian/changelog | 2 ++ .../patches/02_use-ieee-fp-on-s390-and-m68k.patch | 2 +- debian/patches/03_optional-progs-and-install.patch | 2 +- debian/patches/05_hurd-ftbfs.diff | 31 +++++----------------- debian/patches/06_kfreebsd-ftbfs.diff | 8 +++--- 5 files changed, 15 insertions(+), 30 deletions(-) diff --git a/debian/changelog b/debian/changelog index bda7ce89cef..41229f53bd0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,8 @@ mesa (7.6.1-1) UNRELEASED; urgency=low + Pull upstream mesa_7_6_branch up to commit da876fa3 * Bump linux-libc-dev build-dep to 2.6.31 for the r600 dri driver (fixes ftbfs on mips). + * Drop hunk from 05_hurd-ftbfs.diff that was applied upstream. Refresh + other patches. -- Julien Cristau Tue, 29 Dec 2009 10:16:43 +0000 diff --git a/debian/patches/02_use-ieee-fp-on-s390-and-m68k.patch b/debian/patches/02_use-ieee-fp-on-s390-and-m68k.patch index ac8699a9131..e60b0044d60 100644 --- a/debian/patches/02_use-ieee-fp-on-s390-and-m68k.patch +++ b/debian/patches/02_use-ieee-fp-on-s390-and-m68k.patch @@ -6,7 +6,7 @@ Index: mesa/src/mesa/main/compiler.h =================================================================== --- mesa.orig/src/mesa/main/compiler.h +++ mesa/src/mesa/main/compiler.h -@@ -347,8 +347,9 @@ +@@ -351,8 +351,9 @@ * USE_IEEE: Determine if we're using IEEE floating point */ #if defined(__i386__) || defined(__386__) || defined(__sparc__) || \ diff --git a/debian/patches/03_optional-progs-and-install.patch b/debian/patches/03_optional-progs-and-install.patch index d426b88afc4..97d8d5fd2c4 100644 --- a/debian/patches/03_optional-progs-and-install.patch +++ b/debian/patches/03_optional-progs-and-install.patch @@ -52,4 +52,4 @@ Index: mesa/progs/Makefile + done clean: - -@for dir in $(SUBDIRS) tests ; do \ + @list='$(SUBDIRS)'; for dir in $$list tests ; do \ diff --git a/debian/patches/05_hurd-ftbfs.diff b/debian/patches/05_hurd-ftbfs.diff index f3de3e0f398..4d81262811d 100644 --- a/debian/patches/05_hurd-ftbfs.diff +++ b/debian/patches/05_hurd-ftbfs.diff @@ -6,28 +6,11 @@ Subject: Fix build on GNU/Hurd src/glx/x11/dri2.c | 2 ++ 2 files changed, 16 insertions(+), 11 deletions(-) -Index: mesa-7.6.1~rc2/src/glx/x11/dri2.c +Index: mesa/configure.ac =================================================================== ---- mesa-7.6.1~rc2.orig/src/glx/x11/dri2.c 2009-12-05 23:51:01.000000000 +0100 -+++ mesa-7.6.1~rc2/src/glx/x11/dri2.c 2009-12-06 00:10:10.000000000 +0100 -@@ -30,6 +30,7 @@ - * Kristian Høgsberg (krh@redhat.com) - */ - -+#ifdef GLX_DIRECT_RENDERING - - #define NEED_REPLIES - #include -@@ -377,3 +378,4 @@ - UnlockDisplay(dpy); - SyncHandle(); - } -+#endif -Index: mesa-7.6.1~rc2/configure.ac -=================================================================== ---- mesa-7.6.1~rc2.orig/configure.ac 2009-12-05 23:50:57.000000000 +0100 -+++ mesa-7.6.1~rc2/configure.ac 2009-12-06 00:10:27.000000000 +0100 -@@ -538,6 +538,13 @@ +--- mesa.orig/configure.ac ++++ mesa/configure.ac +@@ -539,6 +539,13 @@ enable_xcb=no fi @@ -41,7 +24,7 @@ Index: mesa-7.6.1~rc2/configure.ac dnl dnl libGL configuration per driver dnl -@@ -571,11 +578,13 @@ +@@ -572,11 +579,13 @@ AC_MSG_ERROR([Can't use static libraries for DRI drivers]) fi @@ -58,9 +41,9 @@ Index: mesa-7.6.1~rc2/configure.ac + DRI_PC_REQ_PRIV="libdrm >= $LIBDRM_REQUIRED" + fi - PKG_CHECK_MODULES([LIBDRM_RADEON], [libdrm_radeon], HAVE_LIBDRM_RADEON=yes, HAVE_LIBDRM_RADEON=no) + PKG_CHECK_MODULES([LIBDRM_RADEON], [libdrm_radeon libdrm >= $LIBDRM_RADEON_REQUIRED], HAVE_LIBDRM_RADEON=yes, HAVE_LIBDRM_RADEON=no) -@@ -656,12 +665,6 @@ +@@ -657,12 +666,6 @@ [DRI_DRIVER_SEARCH_DIR="$withval"], [DRI_DRIVER_SEARCH_DIR='${DRI_DRIVER_INSTALL_DIR}']) AC_SUBST([DRI_DRIVER_SEARCH_DIR]) diff --git a/debian/patches/06_kfreebsd-ftbfs.diff b/debian/patches/06_kfreebsd-ftbfs.diff index 0dff9d486d2..87faef76125 100644 --- a/debian/patches/06_kfreebsd-ftbfs.diff +++ b/debian/patches/06_kfreebsd-ftbfs.diff @@ -8,11 +8,11 @@ http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=524690 configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: mesa-7.6.1~rc2/configure.ac +Index: mesa/configure.ac =================================================================== ---- mesa-7.6.1~rc2.orig/configure.ac 2009-12-06 00:10:10.000000000 +0100 -+++ mesa-7.6.1~rc2/configure.ac 2009-12-06 00:10:10.000000000 +0100 -@@ -745,7 +745,7 @@ +--- mesa.orig/configure.ac ++++ mesa/configure.ac +@@ -746,7 +746,7 @@ ;; esac ;; -- cgit v1.2.3 From 53d395336d87b2e3c30a413bd52c7abc94bd1bd7 Mon Sep 17 00:00:00 2001 From: Julien Cristau Date: Tue, 29 Dec 2009 10:42:29 +0000 Subject: Prepare changelog for upload --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 41229f53bd0..067a1196be2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -mesa (7.6.1-1) UNRELEASED; urgency=low +mesa (7.6.1-1) unstable; urgency=low * New upstream release + Pull upstream mesa_7_6_branch up to commit da876fa3 @@ -7,7 +7,7 @@ mesa (7.6.1-1) UNRELEASED; urgency=low * Drop hunk from 05_hurd-ftbfs.diff that was applied upstream. Refresh other patches. - -- Julien Cristau Tue, 29 Dec 2009 10:16:43 +0000 + -- Julien Cristau Tue, 29 Dec 2009 10:42:24 +0000 mesa (7.6.1~rc3-1) unstable; urgency=low -- cgit v1.2.3