scm-commits January 2008

scm-commits@lists.fedoraproject.org

1 participants
8943 discussions

rpms/qgit/EL-5 .cvsignore, 1.14, 1.15 qgit.spec, 1.19, 1.20 sources, 1.14, 1.15
by fedora-extras-commits＠redhat.com 01 Jan '08

01 Jan '08

Author: sharkcz Update of /cvs/extras/rpms/qgit/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24620 Modified Files: .cvsignore qgit.spec sources Log Message: * Tue Jan 1 2008 Dan Horak <dan[at]danny.cz> 1.5.8-1 - update to upstream version 1.5.8 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/qgit/EL-5/.cvsignore,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- .cvsignore 8 Sep 2007 19:58:55 -0000 1.14 +++ .cvsignore 1 Jan 2008 10:01:03 -0000 1.15 @@ -1 +1 @@ -qgit-1.5.7.tar.bz2 +qgit-1.5.8.tar.bz2 Index: qgit.spec =================================================================== RCS file: /cvs/extras/rpms/qgit/EL-5/qgit.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- qgit.spec 18 Sep 2007 15:41:27 -0000 1.19 +++ qgit.spec 1 Jan 2008 10:01:03 -0000 1.20 @@ -1,5 +1,5 @@ Name: qgit -Version: 1.5.7 +Version: 1.5.8 Release: 1%{?dist} Summary: QGit is a git GUI repository browser @@ -49,10 +49,16 @@ %changelog +* Tue Jan 1 2008 Dan Horak <dan[at]danny.cz> 1.5.8-1 +- update to upstream version 1.5.8 + * Sat Sep 8 2007 Dan Horak <dan[at]danny.cz> 1.5.7-1 - update to upstream version 1.5.7 - fixes #268381 + +* Tue Aug 21 2007 Dan Horak <dan[at]danny.cz> 1.5.6-2 - update license tag +- rebuild for F8 * Fri May 23 2007 Dan Horak <dan[at]danny.cz> 1.5.6-1 - update to upstream version 1.5.6 Index: sources =================================================================== RCS file: /cvs/extras/rpms/qgit/EL-5/sources,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- sources 8 Sep 2007 19:58:55 -0000 1.14 +++ sources 1 Jan 2008 10:01:03 -0000 1.15 @@ -1 +1 @@ -2aa52a51e01ec0cde8522281d9ace2aa qgit-1.5.7.tar.bz2 +bdbf2b4ba99f6110daf3118859bce21b qgit-1.5.8.tar.bz2

1 0

rpms/qgit/EL-4 .cvsignore, 1.14, 1.15 qgit.spec, 1.19, 1.20 sources, 1.14, 1.15
by fedora-extras-commits＠redhat.com 01 Jan '08

01 Jan '08

Author: sharkcz Update of /cvs/extras/rpms/qgit/EL-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23540 Modified Files: .cvsignore qgit.spec sources Log Message: * Tue Jan 1 2008 Dan Horak <dan[at]danny.cz> 1.5.8-1 - update to upstream version 1.5.8 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/qgit/EL-4/.cvsignore,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- .cvsignore 8 Sep 2007 19:56:43 -0000 1.14 +++ .cvsignore 1 Jan 2008 09:58:00 -0000 1.15 @@ -1 +1 @@ -qgit-1.5.7.tar.bz2 +qgit-1.5.8.tar.bz2 Index: qgit.spec =================================================================== RCS file: /cvs/extras/rpms/qgit/EL-4/qgit.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- qgit.spec 18 Sep 2007 15:39:54 -0000 1.19 +++ qgit.spec 1 Jan 2008 09:58:00 -0000 1.20 @@ -1,5 +1,5 @@ Name: qgit -Version: 1.5.7 +Version: 1.5.8 Release: 1%{?dist} Summary: QGit is a git GUI repository browser @@ -49,10 +49,16 @@ %changelog +* Tue Jan 1 2008 Dan Horak <dan[at]danny.cz> 1.5.8-1 +- update to upstream version 1.5.8 + * Sat Sep 8 2007 Dan Horak <dan[at]danny.cz> 1.5.7-1 - update to upstream version 1.5.7 - fixes #268381 + +* Tue Aug 21 2007 Dan Horak <dan[at]danny.cz> 1.5.6-2 - update license tag +- rebuild for F8 * Fri May 23 2007 Dan Horak <dan[at]danny.cz> 1.5.6-1 - update to upstream version 1.5.6 Index: sources =================================================================== RCS file: /cvs/extras/rpms/qgit/EL-4/sources,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- sources 8 Sep 2007 19:56:43 -0000 1.14 +++ sources 1 Jan 2008 09:58:00 -0000 1.15 @@ -1 +1 @@ -2aa52a51e01ec0cde8522281d9ace2aa qgit-1.5.7.tar.bz2 +bdbf2b4ba99f6110daf3118859bce21b qgit-1.5.8.tar.bz2

1 0

rpms/qgit/F-7 .cvsignore, 1.14, 1.15 qgit.spec, 1.19, 1.20 sources, 1.14, 1.15
by fedora-extras-commits＠redhat.com 01 Jan '08

01 Jan '08

Author: sharkcz Update of /cvs/extras/rpms/qgit/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23201 Modified Files: .cvsignore qgit.spec sources Log Message: * Tue Jan 1 2008 Dan Horak <dan[at]danny.cz> 1.5.8-1 - update to upstream version 1.5.8 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/qgit/F-7/.cvsignore,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- .cvsignore 8 Sep 2007 19:48:22 -0000 1.14 +++ .cvsignore 1 Jan 2008 09:28:08 -0000 1.15 @@ -1 +1 @@ -qgit-1.5.7.tar.bz2 +qgit-1.5.8.tar.bz2 Index: qgit.spec =================================================================== RCS file: /cvs/extras/rpms/qgit/F-7/qgit.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- qgit.spec 18 Sep 2007 15:52:23 -0000 1.19 +++ qgit.spec 1 Jan 2008 09:28:08 -0000 1.20 @@ -1,5 +1,5 @@ Name: qgit -Version: 1.5.7 +Version: 1.5.8 Release: 1%{?dist} Summary: QGit is a git GUI repository browser @@ -49,10 +49,16 @@ %changelog +* Tue Jan 1 2008 Dan Horak <dan[at]danny.cz> 1.5.8-1 +- update to upstream version 1.5.8 + * Sat Sep 8 2007 Dan Horak <dan[at]danny.cz> 1.5.7-1 - update to upstream version 1.5.7 - fixes #268381 + +* Tue Aug 21 2007 Dan Horak <dan[at]danny.cz> 1.5.6-2 - update license tag +- rebuild for F8 * Fri May 23 2007 Dan Horak <dan[at]danny.cz> 1.5.6-1 - update to upstream version 1.5.6 Index: sources =================================================================== RCS file: /cvs/extras/rpms/qgit/F-7/sources,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- sources 8 Sep 2007 19:48:22 -0000 1.14 +++ sources 1 Jan 2008 09:28:08 -0000 1.15 @@ -1 +1 @@ -2aa52a51e01ec0cde8522281d9ace2aa qgit-1.5.7.tar.bz2 +bdbf2b4ba99f6110daf3118859bce21b qgit-1.5.8.tar.bz2

1 0

rpms/qgit/F-8 .cvsignore, 1.14, 1.15 qgit.spec, 1.20, 1.21 sources, 1.14, 1.15
by fedora-extras-commits＠redhat.com 01 Jan '08

01 Jan '08

Author: sharkcz Update of /cvs/extras/rpms/qgit/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23096 Modified Files: .cvsignore qgit.spec sources Log Message: * Tue Jan 1 2008 Dan Horak <dan[at]danny.cz> 1.5.8-1 - update to upstream version 1.5.8 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/qgit/F-8/.cvsignore,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- .cvsignore 8 Sep 2007 19:42:20 -0000 1.14 +++ .cvsignore 1 Jan 2008 09:23:47 -0000 1.15 @@ -1 +1 @@ -qgit-1.5.7.tar.bz2 +qgit-1.5.8.tar.bz2 Index: qgit.spec =================================================================== RCS file: /cvs/extras/rpms/qgit/F-8/qgit.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- qgit.spec 18 Sep 2007 16:09:07 -0000 1.20 +++ qgit.spec 1 Jan 2008 09:23:47 -0000 1.21 @@ -1,5 +1,5 @@ Name: qgit -Version: 1.5.7 +Version: 1.5.8 Release: 1%{?dist} Summary: QGit is a git GUI repository browser @@ -49,6 +49,9 @@ %changelog +* Tue Jan 1 2008 Dan Horak <dan[at]danny.cz> 1.5.8-1 +- update to upstream version 1.5.8 + * Sat Sep 8 2007 Dan Horak <dan[at]danny.cz> 1.5.7-1 - update to upstream version 1.5.7 - fixes #268381 Index: sources =================================================================== RCS file: /cvs/extras/rpms/qgit/F-8/sources,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- sources 8 Sep 2007 19:42:20 -0000 1.14 +++ sources 1 Jan 2008 09:23:47 -0000 1.15 @@ -1 +1 @@ -2aa52a51e01ec0cde8522281d9ace2aa qgit-1.5.7.tar.bz2 +bdbf2b4ba99f6110daf3118859bce21b qgit-1.5.8.tar.bz2

1 0

rpms/maxima/devel maxima.spec,1.94,1.95
by fedora-extras-commits＠redhat.com 01 Jan '08

01 Jan '08

Author: rdieter Update of /cvs/pkgs/rpms/maxima/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8194 Modified Files: maxima.spec Log Message: * Tue Jan 01 2008 Rex Dieter <rdieter[AT]fedoraproject.org> 5.14.0-3 - (re)enable gcl Index: maxima.spec =================================================================== RCS file: /cvs/pkgs/rpms/maxima/devel/maxima.spec,v retrieving revision 1.94 retrieving revision 1.95 diff -u -r1.94 -r1.95 --- maxima.spec 27 Dec 2007 23:10:03 -0000 1.94 +++ maxima.spec 1 Jan 2008 07:16:46 -0000 1.95 @@ -3,7 +3,7 @@ Name: maxima Version: 5.14.0 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2 Group: Applications/Engineering URL: http://maxima.sourceforge.net/ @@ -25,9 +25,9 @@ %define default_lisp sbcl %if 0%{?fedora} > 2 %define _enable_clisp --enable-clisp -%if 0%{?fedora} < 9 +#if 0%{?fedora} < 9 %define _enable_gcl --enable-gcl -%endif +#endif %define _enable_sbcl --enable-sbcl %else # epel/rhel @@ -421,6 +421,9 @@ %changelog +* Tue Jan 01 2008 Rex Dieter <rdieter[AT]fedoraproject.org> 5.14.0-3 +- (re)enable gcl + * Thu Dec 27 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 5.14.0-2 - respin (sbcl)

1 0

rpms/mesa/F-8 mesa.spec, 1.145, 1.146 mesa-7.0.1-r200-settexoffset.patch, 1.1, NONE
by fedora-extras-commits＠redhat.com 01 Jan '08

01 Jan '08

Author: airlied Update of /cvs/pkgs/rpms/mesa/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1167 Modified Files: mesa.spec Removed Files: mesa-7.0.1-r200-settexoffset.patch Log Message: remove unused patch Index: mesa.spec =================================================================== RCS file: /cvs/pkgs/rpms/mesa/F-8/mesa.spec,v retrieving revision 1.145 retrieving revision 1.146 diff -u -r1.145 -r1.146 --- mesa.spec 1 Jan 2008 06:42:20 -0000 1.145 +++ mesa.spec 1 Jan 2008 06:56:09 -0000 1.146 @@ -51,7 +51,6 @@ Patch25: mesa-7.0-symlinks-before-depend.patch Patch27: mesa-7.0-use_master-r300.patch Patch28: mesa-7.0.1-r300-fix-writemask.patch -Patch29: mesa-7.0.1-r200-settexoffset.patch Patch30: mesa-7.0.2-rx00-vertprog-num-temps-off-by-one.patch Patch31: mesa-7.0.2-t_vp_build-use-less-temps.patch --- mesa-7.0.1-r200-settexoffset.patch DELETED ---

1 0

rpms/mesa/F-8 mesa.spec,1.144,1.145
by fedora-extras-commits＠redhat.com 01 Jan '08

01 Jan '08

Author: airlied Update of /cvs/pkgs/rpms/mesa/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1010 Modified Files: mesa.spec Log Message: remove unused patch Index: mesa.spec =================================================================== RCS file: /cvs/pkgs/rpms/mesa/F-8/mesa.spec,v retrieving revision 1.144 retrieving revision 1.145 diff -u -r1.144 -r1.145 --- mesa.spec 1 Jan 2008 06:36:16 -0000 1.144 +++ mesa.spec 1 Jan 2008 06:42:20 -0000 1.145 @@ -49,7 +49,6 @@ Patch18: mesa-7.0-selinux-awareness.patch Patch23: mesa-6.5.2-bindcontext-paranoia.patch Patch25: mesa-7.0-symlinks-before-depend.patch -Patch26: mesa-7.0.1-stable-branch.patch Patch27: mesa-7.0-use_master-r300.patch Patch28: mesa-7.0.1-r300-fix-writemask.patch Patch29: mesa-7.0.1-r200-settexoffset.patch

1 0

rpms/mesa/F-8 mesa-7.0.2-stable-branch.patch, NONE, 1.1 mesa.spec, 1.143, 1.144 mesa-7.0.1-stable-branch.patch, 1.3, NONE
by fedora-extras-commits＠redhat.com 01 Jan '08

01 Jan '08

Author: airlied Update of /cvs/pkgs/rpms/mesa/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv882 Modified Files: mesa.spec Added Files: mesa-7.0.2-stable-branch.patch Removed Files: mesa-7.0.1-stable-branch.patch Log Message: * Tue Jan 01 2008 Dave Airlie <airlied(a)redhat.com> 7.0.2-2 - mesa-7.0.2-stable-branch.patch: add in mesa 7.0.2 stable patches so far mesa-7.0.2-stable-branch.patch: --- NEW FILE mesa-7.0.2-stable-branch.patch --- commit c1eb78f7ff9a6d80a6db06727a521b5aa3871a3d Author: Roland Scheidegger <sroland(a)tungstengraphics.com> Date: Sat Dec 22 18:49:42 2007 +0100 fix GL_LINE_LOOP with drivers using own render pipeline stage (#12410, #13527) primitive needs to include the begin/end flags (broken since vbo-0.2). Should fix missing first/last line segment on gamma, i810, i915, mga, r200, radeon, s3v, savage, unichrome (r300 already correct). Tested on r200, fixes #13527. commit 8aa0fd6b206930ababb1bae2acc629e2a945c0c0 Author: Brian <brian.paul(a)tungstengraphics.com> Date: Thu Dec 20 09:07:57 2007 -0700 glGetActiveUniform fix commit a1b3a908f557502fc1e5bf4e6357014538778ed8 Author: Brian <brian.paul(a)tungstengraphics.com> Date: Thu Dec 20 09:05:37 2007 -0700 return correct size from glGetActiveUniform (bug 13751) commit f9e70d951a3047a2af87ee43ca6c1045a187ef08 Author: Xiang, Haihao <haihao.xiang(a)intel.com> Date: Wed Dec 19 10:44:00 2007 +0800 i965: allocate GRF registers before building subroutines, it ensures there are sufficient registers for all subroutines. commit 41ed6be1da92fe8b48f106e7b540bd6a8ad2446a Author: Xiang, Haihao <haihao.xiang(a)intel.com> Date: Wed Dec 19 10:36:56 2007 +0800 i965: restore the flag after building the subroutine of the GS thread. fix #13240 commit 27de28fc3ec46cd5cac1e6de52d27922aabe340e Author: Brian <brian.paul(a)tungstengraphics.com> Date: Tue Dec 18 17:07:11 2007 -0700 Remove -I$(TOP)/src/mesa/transform commit dd2f01c229e9a9692fb0c424cb3c587419d04f83 Author: Brian <brian.paul(a)tungstengraphics.com> Date: Tue Dec 18 16:12:34 2007 -0700 simplify update two-side lighting test (follow-on to previous front/back-face changes) commit deb5c56c77d385786d0b4fceed01cdee82f5355d Author: Brian <brian.paul(a)tungstengraphics.com> Date: Tue Dec 18 16:10:06 2007 -0700 fix NEED_SECONDARY_COLOR for vert/frag progs commit 0107acded03c510df2093b0b98bca52b5734dd5b Author: Michel Dänzer <michel(a)tungstengraphics.com> Date: Mon Dec 17 12:20:56 2007 +0100 i915tex: Fix issues with glDrawBuffer(GL_NONE). Don't dereference NULL renderbuffer pointer, and make sure the software fallback sticks. Fixes https://bugs.freedesktop.org/show_bug.cgi?id=13694 . commit 2ac5e08d1d41377dc873b31875701f59e74242ec Author: Brian <brian.paul(a)tungstengraphics.com> Date: Fri Dec 14 14:33:53 2007 -0700 fix polygon cull regression commit 1837b8c214a362ccecc441f7b6880f623e70b8d6 Author: Dan Nicholson <dbn.lists(a)gmail.com> Date: Wed Oct 31 17:12:07 2007 -0700 configs: Fix linking with static libGL and --as-needed Linking of the programs breaks when using a static libGL and the GNU ld option --as-needed. This is because libXext is needed for the XShm functions. (cherry picked from commit 6aaf9bdd418e11d5ccb76a6ab85a8df36b0c8804) commit 03d2bc1774e3612edca4be48c5aeafaafa2a52b1 Author: Brian <brian.paul(a)tungstengraphics.com> Date: Tue Dec 4 14:06:26 2007 -0700 fix gl_FrontFacing commit 385bddbde04ca3ec2a159e8c8a50d9009da25b63 Author: Brian <brian.paul(a)tungstengraphics.com> Date: Tue Dec 4 14:06:01 2007 -0700 fix span->facing computation and gl_FrontFacing initialization commit c13542626729a6fe3e4dfbc71f3569119255b668 Author: Brian <brian.paul(a)tungstengraphics.com> Date: Tue Dec 4 14:05:11 2007 -0700 Fix gl_FrontFacing compilation problem commit 4be0c981205b5530366a10eb96e06b93a2439391 Author: Michel Dänzer <michel(a)tungstengraphics.com> Date: Tue Dec 4 10:46:45 2007 +0100 Use -Bsymbolic for linking all shared objects. Fixes https://bugs.freedesktop.org/show_bug.cgi?id=10132 . Also remove comment about SONAME, as SONAME only applies to shared libraries. (cherry picked from commit fc7ddea8535f1a9c196bf30f7864414e4ac18b8a) commit e760aebd5aaecc220c6789fe925897909a876acd Author: Brian <brian(a)i915.localnet.net> Date: Mon Dec 3 14:11:46 2007 -0700 fix two-side lighting bug/crash commit 1f6e7d9c297aba2e936352d6ae8a4198b5c64af5 Author: Brian <brian(a)i915.localnet.net> Date: Mon Dec 3 14:11:26 2007 -0700 fix DD_TRI_LIGHT_TWOSIDE bug (#13368) commit c6d421af05ccdd377df5cade301c5c25814ddf0c Author: Dan Nicholson <dbn.lists(a)gmail.com> Date: Mon Dec 3 11:57:14 2007 -0800 Fix the library name in glw.pc Fix a copy and paste error s/GLU/GLw/ in glw.pc. (cherry picked from commit 2dc85e8078bed67cb5d8bc3e16484f56c61c61ca) commit 952df5e493198de91b329983dae5366102eb0a25 Author: Brian <brian.paul(a)tungstengraphics.com> Date: Mon Dec 3 11:59:40 2007 -0700 fix two-sided stencil commit 45acb8b058fc0f61a1c2687897c5d4042b534760 Author: Brian <brian.paul(a)tungstengraphics.com> Date: Mon Dec 3 11:58:16 2007 -0700 added missing quote char commit e8997c0183dbdb59884cc02af81d2faab1beaba1 Author: Michel Dänzer <michel(a)tungstengraphics.com> Date: Fri Nov 30 11:40:06 2007 +0100 i915tex: Fix up state changes for i8xx. (cherry picked from commit 2af613e0b8e6f89cc7528ff5a969e18f077e61fc) commit 169e62f563c4eb7dfa9c456a1ee03168af6b546a Author: Brian <brian(a)i915.localnet.net> Date: Fri Nov 30 15:52:41 2007 -0700 fix-build: remove ctx->_Facing assignment commit 1b43babfb126c6318d2f2468ec81b93ee1923774 Author: Brian <brian.paul(a)tungstengraphics.com> Date: Fri Nov 30 13:01:42 2007 -0700 fix broken two-sided stencil commit 43e902f774f8c3cd58310eeb44eec9d3f8f81746 Author: Brian <brian.paul(a)tungstengraphics.com> Date: Fri Nov 30 09:08:11 2007 -0700 better front-plane clip test commit b0a800e249990de0cbc577f8b48a1a301a3b9361 Author: Xiang, Haihao <haihao.xiang(a)intel.com> Date: Fri Nov 30 11:50:08 2007 +0800 i965: use uncompressed instruction to ensure only Pixel Mask Copy is modified as the pixel shader thread turns off pixels based on kill instructions. commit 73d5f232ad5905e6566ddd22f2cbceaac48bd4ad Author: Brian <brian.paul(a)tungstengraphics.com> Date: Thu Nov 29 08:12:33 2007 -0700 New ctx->Driver.Map/UnmapTexture() functions for accessing textures from t_vb_program.c commit f7209541e44c35e64bc9cd4fd8342ee7743b7774 Author: Brian <brian.paul(a)tungstengraphics.com> Date: Thu Nov 29 08:17:37 2007 -0700 cleanups, comments Conflicts: src/mesa/tnl/t_vb_program.c commit 397a32dca7b58b1120874b304e0f39fc314dbb3b Author: Brian <brian.paul(a)tungstengraphics.com> Date: Wed Nov 28 15:19:46 2007 -0700 Move _mesa_load_tracked_matrices() from TNL module to prog_statevars.c [...3041 lines suppressed...] - /* no matrix is tracked, but we leave the register values as-is */ - assert(ctx->VertexProgram.TrackMatrix[i] == GL_NONE); - continue; - } + if (!ctx->Driver.MapTexture) + return; - /* load the matrix values into sequential registers */ - if (ctx->VertexProgram.TrackMatrixTransform[i] == GL_IDENTITY_NV) { - load_matrix(ctx->VertexProgram.Parameters, i*4, mat->m); - } - else if (ctx->VertexProgram.TrackMatrixTransform[i] == GL_INVERSE_NV) { - _math_matrix_analyse(mat); /* update the inverse */ - ASSERT(!_math_matrix_is_dirty(mat)); - load_matrix(ctx->VertexProgram.Parameters, i*4, mat->inv); - } - else if (ctx->VertexProgram.TrackMatrixTransform[i] == GL_TRANSPOSE_NV) { - load_transpose_matrix(ctx->VertexProgram.Parameters, i*4, mat->m); - } - else { - assert(ctx->VertexProgram.TrackMatrixTransform[i] - == GL_INVERSE_TRANSPOSE_NV); - _math_matrix_analyse(mat); /* update the inverse */ - ASSERT(!_math_matrix_is_dirty(mat)); - load_transpose_matrix(ctx->VertexProgram.Parameters, i*4, mat->inv); + for (u = 0; u < ctx->Const.MaxVertexTextureImageUnits; u++) { + if (vp->Base.TexturesUsed[u]) { + /* Note: _Current *should* correspond to the target indicated + * in TexturesUsed[u]. + */ + ctx->Driver.UnmapTexture(ctx, ctx->Texture.Unit[u]._Current); } } } @@ -259,6 +316,7 @@ run_vp( GLcontext *ctx, struct tnl_pipeline_stage *stage ) _mesa_load_state_parameters(ctx, program->Base.Parameters); } + /* make list of outputs to save some time below */ numOutputs = 0; for (i = 0; i < VERT_RESULT_MAX; i++) { if (program->Base.OutputsWritten & (1 << i)) { @@ -266,6 +324,8 @@ run_vp( GLcontext *ctx, struct tnl_pipeline_stage *stage ) } } + map_textures(ctx, program); + for (i = 0; i < VB->Count; i++) { GLuint attr; @@ -317,6 +377,8 @@ run_vp( GLcontext *ctx, struct tnl_pipeline_stage *stage ) #endif } + unmap_textures(ctx, program); + /* Fixup fog and point size results if needed */ if (program->IsNVProgram) { if (ctx->Fog.Enabled && @@ -334,12 +396,39 @@ run_vp( GLcontext *ctx, struct tnl_pipeline_stage *stage ) } } - /* Setup the VB pointers so that the next pipeline stages get - * their data from the right place (the program output arrays). - */ - VB->ClipPtr = &store->results[VERT_RESULT_HPOS]; - VB->ClipPtr->size = 4; - VB->ClipPtr->count = VB->Count; + if (program->IsPositionInvariant) { + /* We need the exact same transform as in the fixed function path here + * to guarantee invariance, depending on compiler optimization flags + * results could be different otherwise. + */ + VB->ClipPtr = TransformRaw( &store->results[0], + &ctx->_ModelProjectMatrix, + VB->AttribPtr[0] ); + + /* Drivers expect this to be clean to element 4... + */ + switch (VB->ClipPtr->size) { + case 1: + /* impossible */ + case 2: + _mesa_vector4f_clean_elem( VB->ClipPtr, VB->Count, 2 ); + /* fall-through */ + case 3: + _mesa_vector4f_clean_elem( VB->ClipPtr, VB->Count, 3 ); + /* fall-through */ + case 4: + break; + } + } + else { + /* Setup the VB pointers so that the next pipeline stages get + * their data from the right place (the program output arrays). + */ + VB->ClipPtr = &store->results[VERT_RESULT_HPOS]; + VB->ClipPtr->size = 4; + VB->ClipPtr->count = VB->Count; + } + VB->ColorPtr[0] = &store->results[VERT_RESULT_COL0]; VB->ColorPtr[1] = &store->results[VERT_RESULT_BFC0]; VB->SecondaryColorPtr[0] = &store->results[VERT_RESULT_COL1]; @@ -365,41 +454,10 @@ run_vp( GLcontext *ctx, struct tnl_pipeline_stage *stage ) } } - /* Cliptest and perspective divide. Clip functions must clear - * the clipmask. - */ - store->ormask = 0; - store->andmask = CLIP_FRUSTUM_BITS; - - if (tnl->NeedNdcCoords) { - VB->NdcPtr = - _mesa_clip_tab[VB->ClipPtr->size]( VB->ClipPtr, - &store->ndcCoords, - store->clipmask, - &store->ormask, - &store->andmask ); - } - else { - VB->NdcPtr = NULL; - _mesa_clip_np_tab[VB->ClipPtr->size]( VB->ClipPtr, - NULL, - store->clipmask, - &store->ormask, - &store->andmask ); - } - - if (store->andmask) /* All vertices are outside the frustum */ - return GL_FALSE; - - /* This is where we'd do clip testing against the user-defined - * clipping planes, but they're not supported by vertex programs. + /* Perform NDC and cliptest operations: */ - - VB->ClipOrMask = store->ormask; - VB->ClipMask = store->clipmask; - - return GL_TRUE; + return do_ndc_cliptest(ctx, store); } diff --git a/src/mesa/tnl/tnl.h b/src/mesa/tnl/tnl.h index 20bed55..c8c0093 100644 --- a/src/mesa/tnl/tnl.h +++ b/src/mesa/tnl/tnl.h @@ -1,9 +1,8 @@ - /* * Mesa 3-D graphics library - * Version: 3.5 + * Version: 7.1 * - * Copyright (C) 1999-2001 Brian Paul All Rights Reserved. + * Copyright (C) 1999-2007 Brian Paul All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -82,7 +81,4 @@ _tnl_draw_prims( GLcontext *ctx, GLuint min_index, GLuint max_index); -extern void -_mesa_load_tracked_matrices(GLcontext *ctx); - #endif diff --git a/src/mesa/tnl_dd/t_dd_tritmp.h b/src/mesa/tnl_dd/t_dd_tritmp.h index 0bf32ff..6c2378f 100644 --- a/src/mesa/tnl_dd/t_dd_tritmp.h +++ b/src/mesa/tnl_dd/t_dd_tritmp.h @@ -155,10 +155,6 @@ static void TAG(triangle)( GLcontext *ctx, GLuint e0, GLuint e1, GLuint e2 ) { facing = AREA_IS_CCW( cc ) ^ ctx->Polygon._FrontBit; - if (DO_TWOSTENCIL && ctx->Stencil.TestTwoSide) { - ctx->_Facing = facing; /* mixed mode rendering: for 2-sided stencil test */ - } - if (DO_UNFILLED) { if (facing) { mode = ctx->Polygon.BackMode; @@ -421,10 +417,6 @@ static void TAG(quad)( GLcontext *ctx, { facing = AREA_IS_CCW( cc ) ^ ctx->Polygon._FrontBit; - if (DO_TWOSTENCIL && ctx->Stencil.TestTwoSide) { - ctx->_Facing = facing; /* mixed mode rendering: for 2-sided stencil test */ - } - if (DO_UNFILLED) { if (facing) { mode = ctx->Polygon.BackMode; Index: mesa.spec =================================================================== RCS file: /cvs/pkgs/rpms/mesa/F-8/mesa.spec,v retrieving revision 1.143 retrieving revision 1.144 diff -u -r1.143 -r1.144 --- mesa.spec 1 Jan 2008 05:46:09 -0000 1.143 +++ mesa.spec 1 Jan 2008 06:36:16 -0000 1.144 @@ -32,7 +32,7 @@ Summary: Mesa graphics libraries Name: mesa Version: 7.0.2 -Release: 1%{?dist} +Release: 2%{?dist} License: MIT Group: System Environment/Libraries URL: http://www.mesa3d.org @@ -42,7 +42,8 @@ Source1: http://internap.dl.sourceforge.net/sourceforge/mesa3d/MesaDemos-%{version}.… Source2: %{manpages}.tar.bz2 -Patch0: mesa-7.0-build-config.patch +Patch0: mesa-7.0.2-stable-branch.patch +Patch1: mesa-7.0-build-config.patch Patch4: mesa-6.5-dont-libglut-me-harder-ok-thx-bye.patch Patch5: mesa-6.5.2-xserver-1.1-source-compat.patch Patch18: mesa-7.0-selinux-awareness.patch @@ -175,7 +176,8 @@ %setup -q -n Mesa-%{version} -b1 -b2 chmod a-x progs/demos/glslnoise.c -%patch0 -p1 -b .build-config +%patch0 -p1 -b .stable +%patch1 -p1 -b .build-config %patch4 -p0 -b .dont-libglut-me-harder-ok-thx-bye %patch5 -p1 -b .xserver-1.1-compat %patch18 -p1 -b .selinux-awareness @@ -414,6 +416,9 @@ %{_libdir}/mesa-demos-data %changelog +* Tue Jan 01 2008 Dave Airlie <airlied(a)redhat.com> 7.0.2-2 +- mesa-7.0.2-stable-branch.patch: add in mesa 7.0.2 stable patches so far + * Tue Jan 01 2008 Dave Airlie <airlied(a)redhat.com> 7.0.2-1 - update to Mesa 7.0.2 final - mesa-7.0.2-rx00-vertprog-num-temps-off-by-one.patch - fixes for maniadrive --- mesa-7.0.1-stable-branch.patch DELETED ---

1 0

rpms/mesa/F-8 mesa-7.0.2-rx00-vertprog-num-temps-off-by-one.patch, NONE, 1.1 mesa-7.0.2-t_vp_build-use-less-temps.patch, NONE, 1.1 .cvsignore, 1.17, 1.18 mesa-7.0-build-config.patch, 1.1, 1.2 mesa-7.0-selinux-awareness.patch, 1.1, 1.2 mesa.spec, 1.142, 1.143 sources, 1.16, 1.17
by fedora-extras-commits＠redhat.com 01 Jan '08

01 Jan '08

Author: airlied Update of /cvs/pkgs/rpms/mesa/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26162 Modified Files: .cvsignore mesa-7.0-build-config.patch mesa-7.0-selinux-awareness.patch mesa.spec sources Added Files: mesa-7.0.2-rx00-vertprog-num-temps-off-by-one.patch mesa-7.0.2-t_vp_build-use-less-temps.patch Log Message: * Tue Jan 01 2008 Dave Airlie <airlied(a)redhat.com> 7.0.2-1 - update to Mesa 7.0.2 final - mesa-7.0.2-rx00-vertprog-num-temps-off-by-one.patch - fixes for maniadrive - mesa-7.0.2-t_vp_build-use-less-temps.patch - fixes for maniadrive mesa-7.0.2-rx00-vertprog-num-temps-off-by-one.patch: --- NEW FILE mesa-7.0.2-rx00-vertprog-num-temps-off-by-one.patch --- --- Mesa-7.0.2/src/mesa/drivers/dri/r200/r200_vertprog.c~ 2007-12-28 22:41:51.000000000 +0100 +++ Mesa-7.0.2/src/mesa/drivers/dri/r200/r200_vertprog.c 2007-12-28 22:41:51.000000000 +0100 @@ -408,6 +408,7 @@ static GLboolean r200_translate_vertex_p int fog_temp_i = 0; int free_inputs; int array_count = 0; + int u_temp_used; vp->native = GL_FALSE; vp->translated = GL_TRUE; @@ -1051,14 +1052,15 @@ else { dofogfix = 0; } + u_temp_used = (R200_VSF_MAX_TEMPS - 1) - u_temp_i; if (mesa_vp->Base.NumNativeTemporaries < - (mesa_vp->Base.NumTemporaries + (R200_VSF_MAX_TEMPS - 1 - u_temp_i))) { + (mesa_vp->Base.NumTemporaries + u_temp_used)) { mesa_vp->Base.NumNativeTemporaries = - mesa_vp->Base.NumTemporaries + (R200_VSF_MAX_TEMPS - 1 - u_temp_i); + mesa_vp->Base.NumTemporaries + u_temp_used; } - if (u_temp_i < mesa_vp->Base.NumTemporaries) { + if ((mesa_vp->Base.NumTemporaries + u_temp_used) > R200_VSF_MAX_TEMPS) { if (R200_DEBUG & DEBUG_FALLBACKS) { - fprintf(stderr, "Ran out of temps, num temps %d, us %d\n", mesa_vp->Base.NumTemporaries, u_temp_i); + fprintf(stderr, "Ran out of temps, num temps %d, us %d\n", mesa_vp->Base.NumTemporaries, u_temp_used); } return GL_FALSE; } --- Mesa-7.0.2/src/mesa/drivers/dri/r300/r300_vertprog.c~ 2007-12-28 22:42:19.000000000 +0100 +++ Mesa-7.0.2/src/mesa/drivers/dri/r300/r300_vertprog.c 2007-12-28 22:42:19.000000000 +0100 @@ -101,8 +101,9 @@ USE OR OTHER DEALINGS IN THE SOFTWARE. #define FREE_TEMPS() \ do { \ - if(u_temp_i < vp->num_temporaries) { \ - WARN_ONCE("Ran out of temps, num temps %d, us %d\n", vp->num_temporaries, u_temp_i); \ + int u_temp_used = (VSF_MAX_FRAGMENT_TEMPS - 1) - u_temp_i; \ + if((vp->num_temporaries + u_temp_used) > VSF_MAX_FRAGMENT_TEMPS) { \ + WARN_ONCE("Ran out of temps, num temps %d, us %d\n", vp->num_temporaries, u_temp_used); \ vp->native = GL_FALSE; \ } \ u_temp_i=VSF_MAX_FRAGMENT_TEMPS-1; \ mesa-7.0.2-t_vp_build-use-less-temps.patch: --- NEW FILE mesa-7.0.2-t_vp_build-use-less-temps.patch --- --- Mesa-7.0.2/src/mesa/tnl/t_vp_build.c 2007-10-23 18:52:25.000000000 +0200 +++ Mesa-7.0.2.new/src/mesa/tnl/t_vp_build.c 2007-12-28 20:36:50.000000000 +0100 @@ -890,7 +890,6 @@ { struct ureg shininess = get_material(p, 0, STATE_SHININESS); emit_op1(p, OPCODE_MOV, dots, WRITEMASK_W, swizzle1(shininess,X)); - release_temp(p, shininess); _col0 = make_temp(p, get_scenecolor(p, 0)); if (separate) @@ -904,7 +903,6 @@ struct ureg shininess = get_material(p, 1, STATE_SHININESS); emit_op1(p, OPCODE_MOV, dots, WRITEMASK_Z, negate(swizzle1(shininess,X))); - release_temp(p, shininess); _bfc0 = make_temp(p, get_scenecolor(p, 1)); if (separate) @@ -972,7 +970,6 @@ struct ureg tmpPpli = get_temp(p); VPpli = get_temp(p); - half = get_temp(p); /* In homogeneous object coordinates */ @@ -983,6 +980,9 @@ */ emit_op2(p, OPCODE_SUB, VPpli, 0, tmpPpli, V); + /* we're done with tmpPpli now */ + release_temp(p, tmpPpli); + /* Normalize VPpli. The dist value also used in * attenuation below. */ @@ -997,10 +997,14 @@ p->state->unit[i].light_attenuated) { att = calculate_light_attenuation(p, i, VPpli, dist); } + + /* We're done with dist now */ + release_temp(p, dist); /* Calculate viewer direction, or use infinite viewer: */ + half = get_temp(p); if (p->state->light_local_viewer) { struct ureg eye_hat = get_eye_position_normalized(p); emit_op2(p, OPCODE_SUB, half, 0, VPpli, eye_hat); @@ -1011,9 +1015,6 @@ } emit_normalize_vec3(p, half, half); - - release_temp(p, dist); - release_temp(p, tmpPpli); } /* Calculate dot products: @@ -1021,6 +1022,10 @@ emit_op2(p, OPCODE_DP3, dots, WRITEMASK_X, normal, VPpli); emit_op2(p, OPCODE_DP3, dots, WRITEMASK_Y, normal, half); + /* we're done with VPpli and half now, so free them as to not drive up + our temp usage unnecessary */ + release_temp(p, VPpli); + release_temp(p, half); /* Front face lighting: */ @@ -1109,8 +1114,6 @@ release_temp(p, specular); } - release_temp(p, half); - release_temp(p, VPpli); release_temp(p, att); } } Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/mesa/F-8/.cvsignore,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- .cvsignore 14 Aug 2007 05:33:46 -0000 1.17 +++ .cvsignore 1 Jan 2008 05:46:09 -0000 1.18 @@ -1,3 +1,5 @@ MesaLib-7.0.1.tar.bz2 MesaDemos-7.0.1.tar.bz2 gl-manpages-1.0.1.tar.bz2 +MesaDemos-7.0.2.tar.bz2 +MesaLib-7.0.2.tar.bz2 mesa-7.0-build-config.patch: Index: mesa-7.0-build-config.patch =================================================================== RCS file: /cvs/pkgs/rpms/mesa/F-8/mesa-7.0-build-config.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- mesa-7.0-build-config.patch 14 Aug 2007 05:33:46 -0000 1.1 +++ mesa-7.0-build-config.patch 1 Jan 2008 05:46:09 -0000 1.2 @@ -1,6 +1,6 @@ -diff -up mesa-20070725/configs/linux.build-config mesa-20070725/configs/linux ---- mesa-20070725/configs/linux.build-config 2007-07-25 09:36:03.000000000 -0400 -+++ mesa-20070725/configs/linux 2007-07-25 10:33:03.000000000 -0400 +diff -up Mesa-7.0.2/configs/linux.da Mesa-7.0.2/configs/linux +--- Mesa-7.0.2/configs/linux.da 2007-11-02 05:09:01.000000000 +1000 ++++ Mesa-7.0.2/configs/linux 2008-01-02 02:24:07.000000000 +1000 @@ -8,7 +8,9 @@ CONFIG_NAME = linux CC = gcc CXX = g++ @@ -12,9 +12,9 @@ PIC_FLAGS = -fPIC # Add '-DGLX_USE_TLS' to ARCH_FLAGS to enable TLS support. Add -m32 -diff -up mesa-20070725/configs/linux-indirect.build-config mesa-20070725/configs/linux-indirect ---- mesa-20070725/configs/linux-indirect.build-config 2007-07-25 09:36:03.000000000 -0400 -+++ mesa-20070725/configs/linux-indirect 2007-07-25 10:34:40.000000000 -0400 +diff -up Mesa-7.0.2/configs/linux-indirect.da Mesa-7.0.2/configs/linux-indirect +--- Mesa-7.0.2/configs/linux-indirect.da 2007-11-02 05:09:01.000000000 +1000 ++++ Mesa-7.0.2/configs/linux-indirect 2008-01-02 02:24:07.000000000 +1000 @@ -15,7 +15,7 @@ CXX = g++ #MKDEP_OPTIONS = -MF depend @@ -24,7 +24,7 @@ PIC_FLAGS = -fPIC # Add '-DGLX_USE_TLS' to ARCH_FLAGS to enable TLS support. -@@ -44,7 +44,7 @@ GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 +@@ -47,7 +47,7 @@ GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 # Directories @@ -33,9 +33,9 @@ DRIVER_DIRS = PROGRAM_DIRS = WINDOW_SYSTEM=dri -diff -up mesa-20070725/configs/linux-dri.build-config mesa-20070725/configs/linux-dri ---- mesa-20070725/configs/linux-dri.build-config 2007-07-25 09:36:03.000000000 -0400 -+++ mesa-20070725/configs/linux-dri 2007-07-25 10:34:31.000000000 -0400 +diff -up Mesa-7.0.2/configs/linux-dri.da Mesa-7.0.2/configs/linux-dri +--- Mesa-7.0.2/configs/linux-dri.da 2007-11-02 05:09:01.000000000 +1000 ++++ Mesa-7.0.2/configs/linux-dri 2008-01-02 02:24:07.000000000 +1000 @@ -12,8 +12,9 @@ CXX = g++ #MKDEP = /usr/X11R6/bin/makedepend #MKDEP = gcc -M @@ -56,7 +56,7 @@ CFLAGS = -Wall -Wmissing-prototypes -std=c99 -ffast-math \ $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) $(ASM_FLAGS) -@@ -36,7 +35,7 @@ CXXFLAGS = -Wall $(OPT_FLAGS) $(PIC_FLAG +@@ -41,7 +40,7 @@ CXXFLAGS += -fno-strict-aliasing ASM_SOURCES = # Library/program dependencies @@ -65,41 +65,29 @@ LIBDRM_CFLAGS = `pkg-config --cflags libdrm` LIBDRM_LIB = `pkg-config --libs libdrm` -@@ -54,10 +53,10 @@ USING_EGL=0 +@@ -59,10 +58,10 @@ USING_EGL=0 # Directories ifeq ($(USING_EGL), 1) -SRC_DIRS = egl glx/x11 mesa glu glut/glx glw +SRC_DIRS = egl glx/x11 mesa glu glut/glx - PROGRAM_DIRS = egl + PROGRAM_DIRS = egl xdemos else -SRC_DIRS = glx/x11 mesa glu glut/glx glw +SRC_DIRS = glx/x11 mesa glu - PROGRAM_DIRS = + PROGRAM_DIRS = xdemos endif -@@ -67,4 +66,4 @@ WINDOW_SYSTEM=dri +@@ -72,4 +71,4 @@ WINDOW_SYSTEM=dri # gamma are missing because they have not been converted to use the new # interface. DRI_DIRS = i810 i915tex i915 i965 mach64 mga r128 r200 r300 radeon s3v \ - savage sis tdfx trident unichrome ffb + savage tdfx trident unichrome ffb # sis -diff -up mesa-20070725/configs/linux-dri-x86.build-config mesa-20070725/configs/linux-dri-x86 ---- mesa-20070725/configs/linux-dri-x86.build-config 2007-07-25 09:36:03.000000000 -0400 -+++ mesa-20070725/configs/linux-dri-x86 2007-07-25 10:33:03.000000000 -0400 -@@ -6,7 +6,7 @@ include $(TOP)/configs/linux-dri - CONFIG_NAME = linux-dri-x86 - - # Unnecessary on x86, generally. --PIC_FLAGS = -+# PIC_FLAGS = - - # Add -m32 to CFLAGS: - ARCH_FLAGS = -m32 -diff -up mesa-20070725/configs/default.build-config mesa-20070725/configs/default ---- mesa-20070725/configs/default.build-config 2007-07-25 09:36:03.000000000 -0400 -+++ mesa-20070725/configs/default 2007-07-25 10:34:20.000000000 -0400 -@@ -58,8 +58,8 @@ GLW_SOURCES = GLwDrawA.c +diff -up Mesa-7.0.2/configs/default.da Mesa-7.0.2/configs/default +--- Mesa-7.0.2/configs/default.da 2007-11-02 01:30:52.000000000 +1000 ++++ Mesa-7.0.2/configs/default 2008-01-02 02:25:54.000000000 +1000 +@@ -59,8 +59,8 @@ GLW_SOURCES = GLwDrawA.c # Directories to build @@ -110,15 +98,16 @@ GLU_DIRS = sgi DRIVER_DIRS = x11 osmesa # Which subdirs under $(TOP)/progs/ to enter: -@@ -72,14 +72,14 @@ GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -l +@@ -73,7 +73,7 @@ GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -l OSMESA_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lm GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) $(EXTRA_LIB_PATH) -lX11 -lXmu -lXt -lXi -lm -GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) $(EXTRA_LIB_PATH) -lXt -lX11 +GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lXm $(EXTRA_LIB_PATH) -lXt -lX11 - APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm - + # Program dependencies - specific GL/glut libraries added in Makefiles + APP_LIB_DEPS = -lm +@@ -82,7 +82,7 @@ APP_LIB_DEPS = -lm # Installation directories (for make install) INSTALL_DIR = /usr/local @@ -127,9 +116,9 @@ # Where libGL will look for DRI hardware drivers DRI_DRIVER_SEARCH_DIR = $(DRI_DRIVER_INSTALL_DIR) -diff -up mesa-20070725/configs/linux-dri-ppc.build-config mesa-20070725/configs/linux-dri-ppc ---- mesa-20070725/configs/linux-dri-ppc.build-config 2007-07-25 09:36:03.000000000 -0400 -+++ mesa-20070725/configs/linux-dri-ppc 2007-07-25 10:33:03.000000000 -0400 +diff -up Mesa-7.0.2/configs/linux-dri-ppc.da Mesa-7.0.2/configs/linux-dri-ppc +--- Mesa-7.0.2/configs/linux-dri-ppc.da 2007-06-22 08:10:53.000000000 +1000 ++++ Mesa-7.0.2/configs/linux-dri-ppc 2008-01-02 02:24:07.000000000 +1000 @@ -5,7 +5,7 @@ include $(TOP)/configs/linux-dri CONFIG_NAME = linux-dri-ppc @@ -139,9 +128,9 @@ PIC_FLAGS = -fPIC ASM_FLAGS = -DUSE_PPC_ASM -DUSE_VMX_ASM -diff -up mesa-20070725/configs/linux-osmesa16.build-config mesa-20070725/configs/linux-osmesa16 ---- mesa-20070725/configs/linux-osmesa16.build-config 2007-07-25 09:36:03.000000000 -0400 -+++ mesa-20070725/configs/linux-osmesa16 2007-07-25 10:33:03.000000000 -0400 +diff -up Mesa-7.0.2/configs/linux-osmesa16.da Mesa-7.0.2/configs/linux-osmesa16 +--- Mesa-7.0.2/configs/linux-osmesa16.da 2007-11-02 05:09:01.000000000 +1000 ++++ Mesa-7.0.2/configs/linux-osmesa16 2008-01-02 02:24:07.000000000 +1000 @@ -7,8 +7,10 @@ CONFIG_NAME = linux-osmesa16 # Compiler and flags CC = gcc @@ -153,9 +142,9 @@ +CFLAGS = $(OPT_FLAGS) $(DEFINES) -DCHAN_BITS=16 -DDEFAULT_SOFTWARE_DEPTH_BITS=31 +CXXFLAGS = $(OPT_FLAGS) $(DEFINES) - - # Library names -@@ -17,12 +19,12 @@ OSMESA_LIB_NAME = libOSMesa16.so + # Work around aliasing bugs - developers should comment this out + CFLAGS += -fno-strict-aliasing +@@ -20,12 +22,12 @@ OSMESA_LIB_NAME = libOSMesa16.so # Directories @@ -170,9 +159,9 @@ +OSMESA_LIB_DEPS = -lm -lpthread -lselinux GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(OSMESA_LIB) APP_LIB_DEPS = -lOSMesa16 -diff -up mesa-20070725/configs/linux-osmesa32.build-config mesa-20070725/configs/linux-osmesa32 ---- mesa-20070725/configs/linux-osmesa32.build-config 2007-07-25 09:36:03.000000000 -0400 -+++ mesa-20070725/configs/linux-osmesa32 2007-07-25 10:33:03.000000000 -0400 +diff -up Mesa-7.0.2/configs/linux-osmesa32.da Mesa-7.0.2/configs/linux-osmesa32 +--- Mesa-7.0.2/configs/linux-osmesa32.da 2007-11-02 05:09:01.000000000 +1000 ++++ Mesa-7.0.2/configs/linux-osmesa32 2008-01-02 02:24:07.000000000 +1000 @@ -7,8 +7,10 @@ CONFIG_NAME = linux-osmesa32 # Compiler and flags CC = gcc @@ -184,9 +173,9 @@ +CFLAGS = $(OPT_FLAGS) $(DEFINES) -DCHAN_BITS=32 -DDEFAULT_SOFTWARE_DEPTH_BITS=31 +CXXFLAGS = $(OPT_FLAGS) $(DEFINES) - - # Library names -@@ -17,12 +19,12 @@ OSMESA_LIB_NAME = libOSMesa32.so + # Work around aliasing bugs - developers should comment this out + CFLAGS += -fno-strict-aliasing +@@ -20,12 +22,12 @@ OSMESA_LIB_NAME = libOSMesa32.so # Directories @@ -201,20 +190,23 @@ +OSMESA_LIB_DEPS = -lm -lpthread -lselinux GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(OSMESA_LIB) APP_LIB_DEPS = -lOSMesa32 -diff -up mesa-20070725/configs/linux-osmesa.build-config mesa-20070725/configs/linux-osmesa ---- mesa-20070725/configs/linux-osmesa.build-config 2007-07-25 09:36:03.000000000 -0400 -+++ mesa-20070725/configs/linux-osmesa 2007-07-25 10:33:03.000000000 -0400 -@@ -9,17 +9,18 @@ CONFIG_NAME = linux-osmesa +diff -up Mesa-7.0.2/configs/linux-osmesa.da Mesa-7.0.2/configs/linux-osmesa +--- Mesa-7.0.2/configs/linux-osmesa.da 2007-11-02 05:09:01.000000000 +1000 ++++ Mesa-7.0.2/configs/linux-osmesa 2008-01-02 02:27:46.000000000 +1000 +@@ -9,20 +9,22 @@ CONFIG_NAME = linux-osmesa # Compiler and flags CC = gcc CXX = g++ -CFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DPTHREADS -CXXFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -- +DEFINES = -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE +OPT_FLAGS ?= -O3 -ansi -pendantic -fPIC -ffast-math +CFLAGS = $(OPT_FLAGS) $(DEFINES) -+CXXFLAGS = $(OPT_FLAGS) $(DEFINES) ++CXXFLAGS = $(OPT_FLAGS) $(DEFINES) + + # Work around aliasing bugs - developers should comment this out + CFLAGS += -fno-strict-aliasing + CXXFLAGS += -fno-strict-aliasing # Directories -SRC_DIRS = mesa glu mesa-7.0-selinux-awareness.patch: Index: mesa-7.0-selinux-awareness.patch =================================================================== RCS file: /cvs/pkgs/rpms/mesa/F-8/mesa-7.0-selinux-awareness.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- mesa-7.0-selinux-awareness.patch 14 Aug 2007 05:33:46 -0000 1.1 +++ mesa-7.0-selinux-awareness.patch 1 Jan 2008 05:46:09 -0000 1.2 @@ -1,66 +1,3 @@ -diff -up Mesa-7.0/src/mesa/tnl/t_vertex_sse.c.jx Mesa-7.0/src/mesa/tnl/t_vertex_sse.c ---- Mesa-7.0/src/mesa/tnl/t_vertex_sse.c.jx 2007-06-21 18:10:54.000000000 -0400 -+++ Mesa-7.0/src/mesa/tnl/t_vertex_sse.c 2007-07-23 15:59:26.000000000 -0400 -@@ -348,7 +348,8 @@ static GLboolean build_vertex_emit( stru - struct x86_reg vp1 = x86_make_reg(file_XMM, 2); - GLubyte *fixup, *label; - -- x86_init_func(&p->func); -+ if (!x86_init_func(&p->func)) -+ return GL_FALSE; - - /* Push a few regs? - */ -@@ -646,7 +647,10 @@ void _tnl_generate_sse_emit( GLcontext * - p.identity = x86_make_reg(file_XMM, 6); - p.chan0 = x86_make_reg(file_XMM, 7); - -- x86_init_func(&p.func); -+ if (!x86_init_func(&p.func)) { -+ vtx->codegen_emit = NULL; -+ return; -+ } - - if (build_vertex_emit(&p)) { - _tnl_register_fastpath( vtx, GL_TRUE ); -diff -up Mesa-7.0/src/mesa/x86/rtasm/x86sse.h.jx Mesa-7.0/src/mesa/x86/rtasm/x86sse.h ---- Mesa-7.0/src/mesa/x86/rtasm/x86sse.h.jx 2007-06-21 18:10:55.000000000 -0400 -+++ Mesa-7.0/src/mesa/x86/rtasm/x86sse.h 2007-07-23 15:59:23.000000000 -0400 -@@ -80,8 +80,8 @@ enum sse_cc { - */ - - --void x86_init_func( struct x86_function *p ); --void x86_init_func_size( struct x86_function *p, GLuint code_size ); -+int x86_init_func( struct x86_function *p ); -+int x86_init_func_size( struct x86_function *p, GLuint code_size ); - void x86_release_func( struct x86_function *p ); - void (*x86_get_func( struct x86_function *p ))( void ); - -diff -up Mesa-7.0/src/mesa/x86/rtasm/x86sse.c.jx Mesa-7.0/src/mesa/x86/rtasm/x86sse.c ---- Mesa-7.0/src/mesa/x86/rtasm/x86sse.c.jx 2007-06-21 18:10:55.000000000 -0400 -+++ Mesa-7.0/src/mesa/x86/rtasm/x86sse.c 2007-07-23 15:59:23.000000000 -0400 -@@ -1063,15 +1063,17 @@ struct x86_reg x86_fn_arg( struct x86_fu - } - - --void x86_init_func( struct x86_function *p ) -+int x86_init_func( struct x86_function *p ) - { -- x86_init_func_size(p, 1024); -+ return x86_init_func_size(p, 1024); - } - --void x86_init_func_size( struct x86_function *p, GLuint code_size ) -+int x86_init_func_size( struct x86_function *p, GLuint code_size ) - { - p->store = _mesa_exec_malloc(code_size); - p->csr = p->store; -+ -+ return (p->store != NULL); - } - - void x86_release_func( struct x86_function *p ) diff -up Mesa-7.0/src/mesa/main/execmem.c.jx Mesa-7.0/src/mesa/main/execmem.c --- Mesa-7.0/src/mesa/main/execmem.c.jx 2007-06-21 18:10:54.000000000 -0400 +++ Mesa-7.0/src/mesa/main/execmem.c 2007-07-23 16:02:30.000000000 -0400 Index: mesa.spec =================================================================== RCS file: /cvs/pkgs/rpms/mesa/F-8/mesa.spec,v retrieving revision 1.142 retrieving revision 1.143 diff -u -r1.142 -r1.143 --- mesa.spec 18 Oct 2007 00:10:50 -0000 1.142 +++ mesa.spec 1 Jan 2008 05:46:09 -0000 1.143 @@ -31,8 +31,8 @@ Summary: Mesa graphics libraries Name: mesa -Version: 7.0.1 -Release: 7%{?dist} +Version: 7.0.2 +Release: 1%{?dist} License: MIT Group: System Environment/Libraries URL: http://www.mesa3d.org @@ -52,6 +52,8 @@ Patch27: mesa-7.0-use_master-r300.patch Patch28: mesa-7.0.1-r300-fix-writemask.patch Patch29: mesa-7.0.1-r200-settexoffset.patch +Patch30: mesa-7.0.2-rx00-vertprog-num-temps-off-by-one.patch +Patch31: mesa-7.0.2-t_vp_build-use-less-temps.patch BuildRequires: pkgconfig %if %{with_dri} @@ -179,10 +181,10 @@ %patch18 -p1 -b .selinux-awareness %patch23 -p1 -b .bindcontext %patch25 -p1 -b .makej -%patch26 -p1 -b .stable %patch27 -p1 -b .r300 %patch28 -p1 -b .r300-writemask -%patch29 -p1 -b .r200-settexoffset +%patch30 -p1 -b .rx00-fix-vp +%patch31 -p1 -b .vp-temp-fix # WARNING: The following files are copyright "Mark J. Kilgard" under the GLUT # license and are not open source/free software, so we remove them. @@ -412,6 +414,11 @@ %{_libdir}/mesa-demos-data %changelog +* Tue Jan 01 2008 Dave Airlie <airlied(a)redhat.com> 7.0.2-1 +- update to Mesa 7.0.2 final +- mesa-7.0.2-rx00-vertprog-num-temps-off-by-one.patch - fixes for maniadrive +- mesa-7.0.2-t_vp_build-use-less-temps.patch - fixes for maniadrive + * Thu Oct 18 2007 Dave Airlie <airlied(a)redhat.com> 7.0.1-7 - mesa-7.0.1-stable-branch.patch - Updated with more fixes from stable - mesa-7.0.1-r300-fix-writemask.patch - fix r300 fragprog writemask Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/mesa/F-8/sources,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- sources 14 Aug 2007 05:33:46 -0000 1.16 +++ sources 1 Jan 2008 05:46:09 -0000 1.17 @@ -1,3 +1,3 @@ -c056abd763e899114bf745c9eedbf9ad MesaLib-7.0.1.tar.bz2 -3b66b3268df12ca8a6c4e0c4c457912c MesaDemos-7.0.1.tar.bz2 6ae05158e678f4594343f32c2ca50515 gl-manpages-1.0.1.tar.bz2 +11a10410bae7be85cf25bc7119966468 MesaDemos-7.0.2.tar.bz2 +93e6ed7924ff069a4f883b4fce5349dc MesaLib-7.0.2.tar.bz2

1 0

rpms/cernlib/EL-5 cernlib.spec,1.39,1.40
by fedora-extras-commits＠redhat.com 01 Jan '08

01 Jan '08

Author: pertusus Update of /cvs/extras/rpms/cernlib/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22968/EL-5 Modified Files: cernlib.spec Log Message: * Mon Dec 31 2007 Patrice Dumas <pertusus at free.fr> 2006-21 - no --build-id for EL-5 Index: cernlib.spec =================================================================== RCS file: /cvs/extras/rpms/cernlib/EL-5/cernlib.spec,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- cernlib.spec 28 Dec 2007 23:03:53 -0000 1.39 +++ cernlib.spec 1 Jan 2008 00:41:14 -0000 1.40 @@ -35,6 +35,14 @@ %define compiler_string -g77 %if ! 0%{?g77_cernlib_compiler} %define compiler -g77 + +# there is no --build-id in RHEL 5. +%if 0%{?rhel} +%if "%rhel" <= "5" +%define no_build_id 1 +%endif +%endif + %endif # no compat prefix, the utilities compiled with gfortran are non functionnal # see Bug 241416 @@ -47,7 +55,7 @@ Name: %{?compat}cernlib%{?compiler} Version: 2006 -Release: 20%{?dist}.1 +Release: 21%{?dist} Summary: General purpose CERN library Group: Development/Libraries # As explained in the cernlib on debian FAQ, cfortran can be considered LGPL. @@ -870,7 +878,11 @@ # optflags are different for g77, so we remove problematic flags FC_OPTFLAGS=`echo "%optflags" | sed -e 's/-mtune=[^ ]\+//' -e 's/-fstack-protector//' -e 's/--param=ssp-buffer-size=[^ ]\+//'` # this is needed (at least in F-8). +%if 0%{?no_build_id} +G_LDFLAGS= +%else G_LDFLAGS='-Wl,--build-id' +%endif FC_COMPILER=g77 %endif @@ -1406,7 +1418,10 @@ %endif %changelog -* Tue Oct 30 2007 Patrice Dumas <pertusus at free.fr> 2006-20.1 +* Mon Dec 31 2007 Patrice Dumas <pertusus at free.fr> 2006-21 +- no --build-id for EL-5 + +* Tue Oct 30 2007 Patrice Dumas <pertusus at free.fr> 2006-20 - don't use the same spec for epel4 - always ship the packages with compiler suffix. This is needed for proper upgrade path as soon as such a package has been ever shipped

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

scm-commits January 2008