This commit is contained in:
parent
ab02e07c75
commit
cf54b6ad4e
17
Mesa.changes
17
Mesa.changes
@ -1,3 +1,20 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Aug 18 03:18:55 CEST 2008 - sndirsch@suse.de
|
||||||
|
|
||||||
|
- reverted commit 1724334 to get RGB, Double-buffered visuals back;
|
||||||
|
otherwise even GL applications like glxgears no longer start
|
||||||
|
(bfo #17069)
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Sun Aug 17 11:46:40 CEST 2008 - sndirsch@suse.de
|
||||||
|
|
||||||
|
- udpated to Mesa 7.1 RC4
|
||||||
|
"This includes the latest GLSL fixes/features plus other assorted
|
||||||
|
fixes from the past 2-3 weeks."
|
||||||
|
- obsoletes MesaLib-6befdca.diff
|
||||||
|
- adjusted disable_ttm_warning.diff (TTM --> GEM)
|
||||||
|
- adjusted i965-GL_MAX_TEXTURE_SIZE-4096.diff
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Mon Aug 11 13:49:19 CEST 2008 - sndirsch@suse.de
|
Mon Aug 11 13:49:19 CEST 2008 - sndirsch@suse.de
|
||||||
|
|
||||||
|
23
Mesa.spec
23
Mesa.spec
@ -27,17 +27,17 @@ Provides: xorg-x11-Mesa
|
|||||||
Obsoletes: xorg-x11-Mesa
|
Obsoletes: xorg-x11-Mesa
|
||||||
AutoReqProv: on
|
AutoReqProv: on
|
||||||
Version: 7.1
|
Version: 7.1
|
||||||
Release: 20
|
Release: 27
|
||||||
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}-rc3.tar.bz2
|
Source: MesaLib-%{version}-rc4.tar.bz2
|
||||||
Source1: MesaDemos-%{version}-rc3.tar.bz2
|
Source1: MesaDemos-%{version}-rc4.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
|
||||||
Patch2: MesaLib-6befdca.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,7 +109,7 @@ Authors:
|
|||||||
Brian Paul
|
Brian Paul
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -n %{name}-%{version}-rc3 -b1 -b4
|
%setup -n %{name}-%{version}-rc4 -b1 -b4
|
||||||
rm docs/README.MINGW32.orig
|
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
|
||||||
@ -120,11 +120,11 @@ rm -rf src/glut progs/{demos,redbook,samples,xdemos,glsl}
|
|||||||
rm -f include/GL/{glut.h,uglglutshapes.h,glutf90.h}
|
rm -f include/GL/{glut.h,uglglutshapes.h,glutf90.h}
|
||||||
%patch1
|
%patch1
|
||||||
sed -i 's/REPLACE/%_lib/g' src/glx/x11/Makefile
|
sed -i 's/REPLACE/%_lib/g' src/glx/x11/Makefile
|
||||||
%patch2
|
|
||||||
### FIXME
|
### FIXME
|
||||||
#%patch6
|
#%patch6
|
||||||
%patch7 -p1
|
%patch7 -p1
|
||||||
%patch9 -p1
|
%patch9 -p1
|
||||||
|
%patch10 -p1 -R
|
||||||
|
|
||||||
%build
|
%build
|
||||||
|
|
||||||
@ -229,6 +229,17 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
/usr/%{_lib}/libOSMesa.a
|
/usr/%{_lib}/libOSMesa.a
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Aug 18 2008 sndirsch@suse.de
|
||||||
|
- reverted commit 1724334 to get RGB, Double-buffered visuals back;
|
||||||
|
otherwise even GL applications like glxgears no longer start
|
||||||
|
(bfo #17069)
|
||||||
|
* Sun Aug 17 2008 sndirsch@suse.de
|
||||||
|
- udpated to Mesa 7.1 RC4
|
||||||
|
"This includes the latest GLSL fixes/features plus other assorted
|
||||||
|
fixes from the past 2-3 weeks."
|
||||||
|
- obsoletes MesaLib-6befdca.diff
|
||||||
|
- adjusted disable_ttm_warning.diff (TTM --> GEM)
|
||||||
|
- adjusted i965-GL_MAX_TEXTURE_SIZE-4096.diff
|
||||||
* Mon Aug 11 2008 sndirsch@suse.de
|
* Mon Aug 11 2008 sndirsch@suse.de
|
||||||
- udpated to Mesa 7.1 RC3
|
- udpated to Mesa 7.1 RC3
|
||||||
* bugfixes
|
* bugfixes
|
||||||
|
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:0e8d289de0c86c45eb5112cf98b4c1c4dc91c5be71e1c5d3bc608c233c2ff47c
|
|
||||||
size 1361409
|
|
3
MesaDemos-7.1-rc4.tar.bz2
Normal file
3
MesaDemos-7.1-rc4.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:85ed1e46fde9b694a04b65f9019149c99b6029da9a5e6662dd47cac1a5ebfb0e
|
||||||
|
size 1369606
|
@ -1,9 +0,0 @@
|
|||||||
--- configs/autoconf.in.orig 2008-07-02 19:20:05.000000000 +0200
|
|
||||||
+++ configs/autoconf.in 2008-07-02 19:20:15.000000000 +0200
|
|
||||||
@@ -98,6 +98,3 @@
|
|
||||||
|
|
||||||
# Where libGL will look for DRI hardware drivers
|
|
||||||
DRI_DRIVER_SEARCH_DIR = $(DRI_DRIVER_INSTALL_DIR)
|
|
||||||
-
|
|
||||||
-# Additional per-platform configuration settings
|
|
||||||
-@EXTRA_CONFIG_LINES@
|
|
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:66752a0c2978cb855c74bf1e05934aa5de83b5f429f5a785d5e1d5470e05e432
|
|
||||||
size 3486718
|
|
3
MesaLib-7.1-rc4.tar.bz2
Normal file
3
MesaLib-7.1-rc4.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:22807f0a716abacff2473e2fdf409ba1b1866fd8e7af614ff75188d87a42f6b1
|
||||||
|
size 3363411
|
23
commit-1724334.diff
Normal file
23
commit-1724334.diff
Normal file
@ -0,0 +1,23 @@
|
|||||||
|
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);
|
@ -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 (ttm_disable) {
|
if (gem_disable) {
|
||||||
fprintf(stderr, "TTM buffer manager disabled. Using classic.\n");
|
fprintf(stderr, "GEM disabled. Using classic.\n");
|
||||||
- } else {
|
- } else {
|
||||||
- fprintf(stderr, "Failed to initialize TTM buffer manager. "
|
- fprintf(stderr, "Failed to initialize GEM. "
|
||||||
- "Falling back to classic.\n");
|
- "Falling back to classic.\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -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; */
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user