Author: arekm Date: Wed Nov 4 11:07:44 2009 GMT Module: packages Tag: HEAD ---- Log message: - rel 4
---- Files affected:
packages/Mesa:
Mesa-git.patch (1.6 -> 1.7) , Mesa.spec (1.225 -> 1.226)
---- Diffs:
================================================================
Index: packages/Mesa/Mesa-git.patch
diff -u packages/Mesa/Mesa-git.patch:1.6 packages/Mesa/Mesa-git.patch:1.7
--- packages/Mesa/Mesa-git.patch:1.6 Wed Nov 4 12:03:43 2009
+++ packages/Mesa/Mesa-git.patch Wed Nov 4 12:07:38 2009
@@ -7930,313 +7930,4 @@
}
ASSERT(rb->_BaseFormat == GL_DEPTH_COMPONENT);
-diff --git a/windows/VC8/mesa/mesa/mesa.vcproj
b/windows/VC8/mesa/mesa/mesa.vcproj
-index 068da16..547483d 100644
---- a/windows/VC8/mesa/mesa/mesa.vcproj
-+++ b/windows/VC8/mesa/mesa/mesa.vcproj
-@@ -122,7 +122,7 @@
- WarningLevel="3"
- SuppressStartupBanner="true"
- DebugInformationFormat="3"
-- CompileAs="0"
-+ CompileAs="1"
-
ForcedIncludeFiles="../../../../src/mesa/main/compiler.h"
- />
- <Tool
-@@ -475,102 +475,70 @@
- >
- </File>
- <File
--
RelativePath="..\..\..\..\src\mesa\shader\grammar\grammar.c"
-+
RelativePath="..\..\..\..\src\mesa\shader\grammar\grammar_mesa.c"
- >
-- <FileConfiguration
-- Name="Release|Win32"
-- ExcludedFromBuild="true"
-- >
-- <Tool
-- Name="VCCLCompilerTool"
-- />
-- </FileConfiguration>
-- <FileConfiguration
-- Name="Debug|Win32"
-- ExcludedFromBuild="true"
-- >
-- <Tool
-- Name="VCCLCompilerTool"
-- />
-- </FileConfiguration>
-- <FileConfiguration
-- Name="Debug Static CRT|Win32"
-- ExcludedFromBuild="true"
-- >
-- <Tool
-- Name="VCCLCompilerTool"
-- />
-- </FileConfiguration>
-- <FileConfiguration
-- Name="Release Static CRT|Win32"
-- ExcludedFromBuild="true"
-- >
-- <Tool
-- Name="VCCLCompilerTool"
-- />
-- </FileConfiguration>
- </File>
- <File
--
RelativePath="..\..\..\..\src\mesa\shader\grammar\grammar_crt.c"
-+ RelativePath="..\..\..\..\src\mesa\main\hash.c"
-+ >
-+ </File>
-+ <File
-+
RelativePath="..\..\..\..\src\mesa\shader\hash_table.c"
-+ >
-+ </File>
-+ <File
-+ RelativePath="..\..\..\..\src\mesa\main\hint.c"
-+ >
-+ </File>
-+ <File
-+
RelativePath="..\..\..\..\src\mesa\main\histogram.c"
-+ >
-+ </File>
-+ <File
-+ RelativePath="..\..\..\..\src\mesa\main\image.c"
-+ >
-+ </File>
-+ <File
-+
RelativePath="..\..\..\..\src\mesa\main\imports.c"
-+ >
-+ </File>
-+ <File
-+
RelativePath="..\..\..\..\src\mesa\shader\lex.yy.c"
- >
- <FileConfiguration
- Name="Release|Win32"
-- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
-+
PreprocessorDefinitions="YY_NO_UNISTD_H;YY_USE_CONST;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
-- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
-+
PreprocessorDefinitions="YY_NO_UNISTD_H;YY_USE_CONST;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug Static CRT|Win32"
-- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
-+
PreprocessorDefinitions="YY_NO_UNISTD_H;YY_USE_CONST;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release Static CRT|Win32"
-- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
-+
PreprocessorDefinitions="YY_NO_UNISTD_H;YY_USE_CONST;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
- />
- </FileConfiguration>
- </File>
- <File
--
RelativePath="..\..\..\..\src\mesa\shader\grammar\grammar_mesa.c"
-- >
-- </File>
-- <File
-- RelativePath="..\..\..\..\src\mesa\main\hash.c"
-- >
-- </File>
-- <File
-- RelativePath="..\..\..\..\src\mesa\main\hint.c"
-- >
-- </File>
-- <File
--
RelativePath="..\..\..\..\src\mesa\main\histogram.c"
-- >
-- </File>
-- <File
-- RelativePath="..\..\..\..\src\mesa\main\image.c"
-- >
-- </File>
-- <File
--
RelativePath="..\..\..\..\src\mesa\main\imports.c"
-- >
-- </File>
-- <File
- RelativePath="..\..\..\..\src\mesa\main\light.c"
- >
- </File>
-@@ -679,6 +647,10 @@
- >
- </File>
- <File
-+
RelativePath="..\..\..\..\src\mesa\shader\prog_parameter_layout.c"
-+ >
-+ </File>
-+ <File
-
RelativePath="..\..\..\..\src\mesa\shader\prog_print.c"
- >
- </File>
-@@ -695,6 +667,46 @@
- >
- </File>
- <File
-+
RelativePath="..\..\..\..\src\mesa\shader\program_parse.tab.c"
-+ >
-+ <FileConfiguration
-+ Name="Release|Win32"
-+ >
-+ <Tool
-+ Name="VCCLCompilerTool"
-+
PreprocessorDefinitions="YYMALLOC=malloc;YYFREE=free"
-+ />
-+ </FileConfiguration>
-+ <FileConfiguration
-+ Name="Debug|Win32"
-+ >
-+ <Tool
-+ Name="VCCLCompilerTool"
-+
PreprocessorDefinitions="YYMALLOC=malloc;YYFREE=free"
-+ />
-+ </FileConfiguration>
-+ <FileConfiguration
-+ Name="Debug Static CRT|Win32"
-+ >
-+ <Tool
-+ Name="VCCLCompilerTool"
-+
PreprocessorDefinitions="YYMALLOC=malloc;YYFREE=free"
-+ />
-+ </FileConfiguration>
-+ <FileConfiguration
-+ Name="Release Static CRT|Win32"
-+ >
-+ <Tool
-+ Name="VCCLCompilerTool"
-+
PreprocessorDefinitions="YYMALLOC=malloc;YYFREE=free"
-+ />
-+ </FileConfiguration>
-+ </File>
-+ <File
-+
RelativePath="..\..\..\..\src\mesa\shader\program_parse_extra.c"
-+ >
-+ </File>
-+ <File
-
RelativePath="..\..\..\..\src\mesa\shader\programopt.c"
- >
- </File>
-@@ -947,6 +959,14 @@
- >
- </File>
- <File
-+
RelativePath="..\..\..\..\src\mesa\shader\symbol_table.c"
-+ >
-+ </File>
-+ <File
-+
RelativePath="..\..\..\..\src\mesa\main\syncobj.c"
-+ >
-+ </File>
-+ <File
-
RelativePath="..\..\..\..\src\mesa\tnl\t_context.c"
- >
- </File>
-@@ -1135,42 +1155,6 @@
- >
- </File>
- <File
--
RelativePath="..\..\..\..\src\mesa\main\vsnprintf.c"
-- >
-- <FileConfiguration
-- Name="Release|Win32"
-- ExcludedFromBuild="true"
-- >
-- <Tool
-- Name="VCCLCompilerTool"
-- />
-- </FileConfiguration>
-- <FileConfiguration
-- Name="Debug|Win32"
-- ExcludedFromBuild="true"
-- >
-- <Tool
-- Name="VCCLCompilerTool"
-- />
-- </FileConfiguration>
-- <FileConfiguration
-- Name="Debug Static CRT|Win32"
-- ExcludedFromBuild="true"
-- >
-- <Tool
-- Name="VCCLCompilerTool"
-- />
-- </FileConfiguration>
-- <FileConfiguration
-- Name="Release Static CRT|Win32"
-- ExcludedFromBuild="true"
-- >
-- <Tool
-- Name="VCCLCompilerTool"
-- />
-- </FileConfiguration>
-- </File>
-- <File
-
RelativePath="..\..\..\..\src\mesa\main\vtxfmt.c"
- >
- </File>
-@@ -1396,6 +1380,10 @@
- >
- </File>
- <File
-+
RelativePath="..\..\..\..\src\mesa\shader\hash_table.h"
-+ >
-+ </File>
-+ <File
- RelativePath="..\..\..\..\src\mesa\main\hint.h"
- >
- </File>
-@@ -1556,6 +1544,10 @@
- >
- </File>
- <File
-+
RelativePath="..\..\..\..\src\mesa\shader\prog_parameter_layout.h"
-+ >
-+ </File>
-+ <File
-
RelativePath="..\..\..\..\src\mesa\shader\prog_print.h"
- >
- </File>
-@@ -1572,6 +1564,10 @@
- >
- </File>
- <File
-+
RelativePath="..\..\..\..\src\mesa\shader\program_parse.tab.h"
-+ >
-+ </File>
-+ <File
-
RelativePath="..\..\..\..\src\mesa\shader\programopt.h"
- >
- </File>
-@@ -1844,6 +1840,14 @@
- >
- </File>
- <File
-+
RelativePath="..\..\..\..\src\mesa\shader\symbol_table.h"
-+ >
-+ </File>
-+ <File
-+
RelativePath="..\..\..\..\src\mesa\main\syncobj.h"
-+ >
-+ </File>
-+ <File
-
RelativePath="..\..\..\..\src\mesa\tnl\t_context.h"
- >
- </File>
+
================================================================
Index: packages/Mesa/Mesa.spec
diff -u packages/Mesa/Mesa.spec:1.225 packages/Mesa/Mesa.spec:1.226
--- packages/Mesa/Mesa.spec:1.225 Wed Nov 4 12:03:43 2009
+++ packages/Mesa/Mesa.spec Wed Nov 4 12:07:39 2009
@@ -26,7 +26,7 @@
Summary(pl.UTF-8): Wolnodostępna implementacja standardu OpenGL
Name: Mesa
Version: 7.6
-Release: 3%{?with_multigl:.mgl}
+Release: 4%{?with_multigl:.mgl}
License: MIT (core), SGI (GLU,libGLw) and others - see license.html file
Group: X11/Libraries
Source0:
ftp://ftp.freedesktop.org/pub/mesa/%{version}/%{name}Lib-%{version}.tar.bz2
@@ -969,6 +969,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.226 2009/11/04 11:07:39 arekm
+- rel 4
+
Revision 1.225 2009/11/04 11:03:43 arekm
- rel 3; more git fixes
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/Mesa/Mesa-git.patch?r1=1.6&r2=1.7&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/Mesa/Mesa.spec?r1=1.225&r2=1.226&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
