From cf54b6ad4eadc335e0786e284475f359026eedebb04fc92a1a4b13d19cc9c2ac Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Fri, 22 Aug 2008 23:15:07 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/Mesa?expand=0&rev=42 --- Mesa.changes | 17 +++++++++++++++++ Mesa.spec | 23 +++++++++++++++++------ MesaDemos-7.1-rc3.tar.bz2 | 3 --- MesaDemos-7.1-rc4.tar.bz2 | 3 +++ MesaLib-6befdca.diff | 9 --------- MesaLib-7.1-rc3.tar.bz2 | 3 --- MesaLib-7.1-rc4.tar.bz2 | 3 +++ commit-1724334.diff | 23 +++++++++++++++++++++++ disable_ttm_warning.diff | 6 +++--- i965-GL_MAX_TEXTURE_SIZE-4096.diff | 2 +- 10 files changed, 67 insertions(+), 25 deletions(-) delete mode 100644 MesaDemos-7.1-rc3.tar.bz2 create mode 100644 MesaDemos-7.1-rc4.tar.bz2 delete mode 100644 MesaLib-6befdca.diff delete mode 100644 MesaLib-7.1-rc3.tar.bz2 create mode 100644 MesaLib-7.1-rc4.tar.bz2 create mode 100644 commit-1724334.diff diff --git a/Mesa.changes b/Mesa.changes index c19b603..89e8b85 100644 --- a/Mesa.changes +++ b/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 diff --git a/Mesa.spec b/Mesa.spec index 5fb63e5..d3b605c 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -27,17 +27,17 @@ Provides: xorg-x11-Mesa Obsoletes: xorg-x11-Mesa AutoReqProv: on 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 -Source: MesaLib-%{version}-rc3.tar.bz2 -Source1: MesaDemos-%{version}-rc3.tar.bz2 +Source: MesaLib-%{version}-rc4.tar.bz2 +Source1: MesaDemos-%{version}-rc4.tar.bz2 Source3: README.updates Source4: manual-pages.tar.bz2 Patch1: dri_driver_dir.diff -Patch2: MesaLib-6befdca.diff Patch6: link-shared.diff Patch7: disable_ttm_warning.diff Patch9: i965-GL_MAX_TEXTURE_SIZE-4096.diff +Patch10: commit-1724334.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -109,7 +109,7 @@ Authors: Brian Paul %prep -%setup -n %{name}-%{version}-rc3 -b1 -b4 +%setup -n %{name}-%{version}-rc4 -b1 -b4 rm docs/README.MINGW32.orig # make legal department happy (Bug #204110) 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} %patch1 sed -i 's/REPLACE/%_lib/g' src/glx/x11/Makefile -%patch2 ### FIXME #%patch6 %patch7 -p1 %patch9 -p1 +%patch10 -p1 -R %build @@ -229,6 +229,17 @@ rm -rf $RPM_BUILD_ROOT /usr/%{_lib}/libOSMesa.a %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 - udpated to Mesa 7.1 RC3 * bugfixes diff --git a/MesaDemos-7.1-rc3.tar.bz2 b/MesaDemos-7.1-rc3.tar.bz2 deleted file mode 100644 index b558438..0000000 --- a/MesaDemos-7.1-rc3.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0e8d289de0c86c45eb5112cf98b4c1c4dc91c5be71e1c5d3bc608c233c2ff47c -size 1361409 diff --git a/MesaDemos-7.1-rc4.tar.bz2 b/MesaDemos-7.1-rc4.tar.bz2 new file mode 100644 index 0000000..2d01584 --- /dev/null +++ b/MesaDemos-7.1-rc4.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:85ed1e46fde9b694a04b65f9019149c99b6029da9a5e6662dd47cac1a5ebfb0e +size 1369606 diff --git a/MesaLib-6befdca.diff b/MesaLib-6befdca.diff deleted file mode 100644 index 9d48613..0000000 --- a/MesaLib-6befdca.diff +++ /dev/null @@ -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@ diff --git a/MesaLib-7.1-rc3.tar.bz2 b/MesaLib-7.1-rc3.tar.bz2 deleted file mode 100644 index f016667..0000000 --- a/MesaLib-7.1-rc3.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:66752a0c2978cb855c74bf1e05934aa5de83b5f429f5a785d5e1d5470e05e432 -size 3486718 diff --git a/MesaLib-7.1-rc4.tar.bz2 b/MesaLib-7.1-rc4.tar.bz2 new file mode 100644 index 0000000..802d163 --- /dev/null +++ b/MesaLib-7.1-rc4.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:22807f0a716abacff2473e2fdf409ba1b1866fd8e7af614ff75188d87a42f6b1 +size 3363411 diff --git a/commit-1724334.diff b/commit-1724334.diff new file mode 100644 index 0000000..adb1df2 --- /dev/null +++ b/commit-1724334.diff @@ -0,0 +1,23 @@ +commit 1724334d7c82abe55b6506dfe369df4facae6f06 +Author: Dave Miller +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); diff --git a/disable_ttm_warning.diff b/disable_ttm_warning.diff index a2d3a56..87c6192 100644 --- a/disable_ttm_warning.diff +++ b/disable_ttm_warning.diff @@ -4,10 +4,10 @@ index f8ea646..e7d6091 100644 +++ b/src/mesa/drivers/dri/intel/intel_context.c @@ -487,9 +487,6 @@ intel_init_bufmgr(struct intel_context *intel) if (intel->bufmgr == NULL) { - if (ttm_disable) { - fprintf(stderr, "TTM buffer manager disabled. Using classic.\n"); + if (gem_disable) { + fprintf(stderr, "GEM disabled. Using classic.\n"); - } else { -- fprintf(stderr, "Failed to initialize TTM buffer manager. " +- fprintf(stderr, "Failed to initialize GEM. " - "Falling back to classic.\n"); } diff --git a/i965-GL_MAX_TEXTURE_SIZE-4096.diff b/i965-GL_MAX_TEXTURE_SIZE-4096.diff index d376c79..d7c4565 100644 --- a/i965-GL_MAX_TEXTURE_SIZE-4096.diff +++ b/i965-GL_MAX_TEXTURE_SIZE-4096.diff @@ -12,6 +12,6 @@ index 1c7ad5c..e2ddb38 100644 ctx->Const.MaxCubeTextureLevels = 12; - ctx->Const.MaxTextureRectSize = (1<<11); + ctx->Const.MaxTextureRectSize = (1<<12); - ctx->Const.MaxTextureUnits = BRW_MAX_TEX_UNIT; /* ctx->Const.MaxNativeVertexProgramTemps = 32; */ +