From bb83c0d3da2eb881169a62d46ee1f5b0d4f63dda Mon Sep 17 00:00:00 2001 From: Norman Feske Date: Fri, 27 Jun 2014 14:03:50 +0200 Subject: [PATCH] mesa: apply patches (fix #1193) --- repos/libports/ports/mesa.hash | 2 +- repos/libports/ports/mesa.port | 3 +++ repos/libports/src/lib/egl/opengl_precision.patch | 6 ++---- repos/libports/src/lib/gallium/p_state_config.patch | 4 ++-- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/repos/libports/ports/mesa.hash b/repos/libports/ports/mesa.hash index ec4a5e840..19c28a681 100644 --- a/repos/libports/ports/mesa.hash +++ b/repos/libports/ports/mesa.hash @@ -1 +1 @@ -62ddafecf42585a5630d3b60ac6d058f5f8330b3 +abe06d02df59ba0624e97c92a91ab2d9806d4889 diff --git a/repos/libports/ports/mesa.port b/repos/libports/ports/mesa.port index fd4f3656d..daacdf043 100644 --- a/repos/libports/ports/mesa.port +++ b/repos/libports/ports/mesa.port @@ -6,6 +6,9 @@ URL(mesa) := ftp://ftp.freedesktop.org/pub/mesa/older-versions/7.x/$(VERSION)/Me SHA(mesa) := 74e72b56c7ae779649c18867fe9e0865f3bfc057 DIR(mesa) := src/lib/mesa +PATCHES := src/lib/gallium/p_state_config.patch \ + src/lib/egl/opengl_precision.patch + DIRS := include include/EGL DIR_CONTENT(include) := $(addprefix src/lib/mesa/include/,GL KHR) DIR_CONTENT(include/EGL) := $(addprefix src/lib/mesa/include/EGL/,egl.h eglext.h) diff --git a/repos/libports/src/lib/egl/opengl_precision.patch b/repos/libports/src/lib/egl/opengl_precision.patch index c5c673fa5..a800a00dd 100644 --- a/repos/libports/src/lib/egl/opengl_precision.patch +++ b/repos/libports/src/lib/egl/opengl_precision.patch @@ -10,10 +10,8 @@ the compile errors and didn't seem to cause any problems so far. src/mesa/shader/slang/slang_compile.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/src/mesa/shader/slang/slang_compile.c b/src/mesa/shader/slang/slang_compile.c -index ad86676..101623d 100644 ---- a/src/mesa/shader/slang/slang_compile.c -+++ b/src/mesa/shader/slang/slang_compile.c +--- src/lib/mesa/src/mesa/shader/slang/slang_compile.c +--- src/lib/mesa/src/mesa/shader/slang/slang_compile.c @@ -2571,7 +2571,7 @@ parse_code_unit(slang_parse_ctx * C, slang_code_unit * unit, #if FEATURE_es2_glsl o.allow_precision = GL_TRUE; diff --git a/repos/libports/src/lib/gallium/p_state_config.patch b/repos/libports/src/lib/gallium/p_state_config.patch index 480a2b3da..dbc14596b 100644 --- a/repos/libports/src/lib/gallium/p_state_config.patch +++ b/repos/libports/src/lib/gallium/p_state_config.patch @@ -2,8 +2,8 @@ Reduce memory allocated in 'sp_context.c' used for caching. By default, more than 100 MB of memory gets allocated via malloc. We override the definitions in 'gallium/include/pipe/p_state.h' to reduce the footprint. ---- src/gallium/include/pipe/p_state.h 2010-04-05 18:05:15.000000000 +0200 -+++ src/gallium/include/pipe/p_state.h 2010-08-07 22:45:24.000000000 +0200 +--- src/lib/mesa/src/gallium/include/pipe/p_state.h +--- src/lib/mesa/src/gallium/include/pipe/p_state.h @@ -56,10 +56,10 @@ */ #define PIPE_MAX_ATTRIBS 32