SHA256
1
0
forked from pool/Mesa
OBS User unknown 2008-08-29 22:54:46 +00:00 committed by Git OBS Bridge
parent cf54b6ad4e
commit 444cec85a7
9 changed files with 40 additions and 41 deletions

View File

@ -1,3 +1,20 @@
-------------------------------------------------------------------
Fri Aug 29 16:08:15 CEST 2008 - sndirsch@suse.de
- added libexpat-devel to Buildrequires to fix build
-------------------------------------------------------------------
Thu Aug 28 12:51:22 CEST 2008 - sndirsch@suse.de
- revert of commit-1724334.diff obsolete after adding the patches
commit-5930aeb.diff/commit-78f50cd.diff (commits 5930aeb/78f50cd)
to xorg-x11-server package (bfo #17069)
-------------------------------------------------------------------
Wed Aug 27 16:38:12 CEST 2008 - sndirsch@suse.de
- updated to Mesa 7.1 final release
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Aug 18 03:18:55 CEST 2008 - sndirsch@suse.de Mon Aug 18 03:18:55 CEST 2008 - sndirsch@suse.de

View File

@ -19,7 +19,7 @@
Name: Mesa Name: Mesa
BuildRequires: gcc-c++ libdrm-devel pkgconfig xorg-x11-devel BuildRequires: gcc-c++ libdrm-devel libexpat-devel pkgconfig xorg-x11-devel
Url: http://www.mesa3d.org Url: http://www.mesa3d.org
License: X11/MIT License: X11/MIT
Group: System/Libraries Group: System/Libraries
@ -27,17 +27,16 @@ Provides: xorg-x11-Mesa
Obsoletes: xorg-x11-Mesa Obsoletes: xorg-x11-Mesa
AutoReqProv: on AutoReqProv: on
Version: 7.1 Version: 7.1
Release: 27 Release: 29
Summary: Mesa is a 3-D graphics library with an API which is very similar to that of OpenGL Summary: Mesa is a 3-D graphics library with an API which is very similar to that of OpenGL
Source: MesaLib-%{version}-rc4.tar.bz2 Source: MesaLib-%{version}.tar.bz2
Source1: MesaDemos-%{version}-rc4.tar.bz2 Source1: MesaDemos-%{version}.tar.bz2
Source3: README.updates Source3: README.updates
Source4: manual-pages.tar.bz2 Source4: manual-pages.tar.bz2
Patch1: dri_driver_dir.diff Patch1: dri_driver_dir.diff
Patch6: link-shared.diff Patch6: link-shared.diff
Patch7: disable_ttm_warning.diff Patch7: disable_ttm_warning.diff
Patch9: i965-GL_MAX_TEXTURE_SIZE-4096.diff Patch9: i965-GL_MAX_TEXTURE_SIZE-4096.diff
Patch10: commit-1724334.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description %description
@ -109,8 +108,7 @@ Authors:
Brian Paul Brian Paul
%prep %prep
%setup -n %{name}-%{version}-rc4 -b1 -b4 %setup -n %{name}-%{version} -b1 -b4
rm docs/README.MINGW32.orig
# make legal department happy (Bug #204110) # make legal department happy (Bug #204110)
test -f src/mesa/drivers/directfb/idirectfbgl_mesa.c && exit 1 test -f src/mesa/drivers/directfb/idirectfbgl_mesa.c && exit 1
test -f progs/ggi/asc-view.c && exit 1 test -f progs/ggi/asc-view.c && exit 1
@ -124,7 +122,6 @@ sed -i 's/REPLACE/%_lib/g' src/glx/x11/Makefile
#%patch6 #%patch6
%patch7 -p1 %patch7 -p1
%patch9 -p1 %patch9 -p1
%patch10 -p1 -R
%build %build
@ -229,6 +226,14 @@ rm -rf $RPM_BUILD_ROOT
/usr/%{_lib}/libOSMesa.a /usr/%{_lib}/libOSMesa.a
%changelog %changelog
* Fri Aug 29 2008 sndirsch@suse.de
- added libexpat-devel to Buildrequires to fix build
* Thu Aug 28 2008 sndirsch@suse.de
- revert of commit-1724334.diff obsolete after adding the patches
commit-5930aeb.diff/commit-78f50cd.diff (commits 5930aeb/78f50cd)
to xorg-x11-server package (bfo #17069)
* Wed Aug 27 2008 sndirsch@suse.de
- updated to Mesa 7.1 final release
* Mon Aug 18 2008 sndirsch@suse.de * Mon Aug 18 2008 sndirsch@suse.de
- reverted commit 1724334 to get RGB, Double-buffered visuals back; - reverted commit 1724334 to get RGB, Double-buffered visuals back;
otherwise even GL applications like glxgears no longer start otherwise even GL applications like glxgears no longer start

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:85ed1e46fde9b694a04b65f9019149c99b6029da9a5e6662dd47cac1a5ebfb0e
size 1369606

3
MesaDemos-7.1.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9d13c4f0b8f9269f4b11911f85266e27c3854afeab60bec6616cd80be700f2ff
size 1358435

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:22807f0a716abacff2473e2fdf409ba1b1866fd8e7af614ff75188d87a42f6b1
size 3363411

3
MesaLib-7.1.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:449466a5f8ded820002ad6ef3f28e1bb1664ffc9144e92a24a067bb7fa4a5cbc
size 3365024

View File

@ -1,23 +0,0 @@
commit 1724334d7c82abe55b6506dfe369df4facae6f06
Author: Dave Miller <davem@davemloft.net>
Date: Sat Aug 9 16:44:10 2008 +1000
dri: fix crash in driGetConfigAttribIndex
Accessing a GLboolean via an int pointer on big-endian == bad.
diff --git a/src/mesa/drivers/dri/common/utils.c b/src/mesa/drivers/dri/common/utils.c
index 7fbe0d8..c723dfd 100644
--- a/src/mesa/drivers/dri/common/utils.c
+++ b/src/mesa/drivers/dri/common/utils.c
@@ -836,6 +836,10 @@ driGetConfigAttribIndex(const __DRIconfig *config,
case __DRI_ATTRIB_SWAP_METHOD:
break;
+ case __DRI_ATTRIB_FLOAT_MODE:
+ *value = config->modes.floatMode;
+ break;
+
default:
*value = *(unsigned int *)
((char *) &config->modes + attribMap[index].offset);

View File

@ -4,10 +4,10 @@ index f8ea646..e7d6091 100644
+++ b/src/mesa/drivers/dri/intel/intel_context.c +++ b/src/mesa/drivers/dri/intel/intel_context.c
@@ -487,9 +487,6 @@ intel_init_bufmgr(struct intel_context *intel) @@ -487,9 +487,6 @@ intel_init_bufmgr(struct intel_context *intel)
if (intel->bufmgr == NULL) { if (intel->bufmgr == NULL) {
if (gem_disable) { if (ttm_disable) {
fprintf(stderr, "GEM disabled. Using classic.\n"); fprintf(stderr, "TTM buffer manager disabled. Using classic.\n");
- } else { - } else {
- fprintf(stderr, "Failed to initialize GEM. " - fprintf(stderr, "Failed to initialize TTM buffer manager. "
- "Falling back to classic.\n"); - "Falling back to classic.\n");
} }

View File

@ -12,6 +12,6 @@ index 1c7ad5c..e2ddb38 100644
ctx->Const.MaxCubeTextureLevels = 12; ctx->Const.MaxCubeTextureLevels = 12;
- ctx->Const.MaxTextureRectSize = (1<<11); - ctx->Const.MaxTextureRectSize = (1<<11);
+ ctx->Const.MaxTextureRectSize = (1<<12); + ctx->Const.MaxTextureRectSize = (1<<12);
ctx->Const.MaxTextureUnits = BRW_MAX_TEX_UNIT;
/* ctx->Const.MaxNativeVertexProgramTemps = 32; */ /* ctx->Const.MaxNativeVertexProgramTemps = 32; */