summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/mesa/mesa
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2011-10-13 09:20:43 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-10-14 13:18:09 +0100
commit77fa7e113b9be222c902ecab8bf3d25de991d1c8 (patch)
tree4f99da21d3a275b01c773e4eb9b11b5299ea74be /meta/recipes-graphics/mesa/mesa
parent462f77aa3a6a9b055f4435b10eb24013bec1b374 (diff)
downloadpoky-77fa7e113b9be222c902ecab8bf3d25de991d1c8.tar.gz
mesa: move common patches which could be used in both mesa-dri and mesa-xlib from mesa-dri to mesa
(From OE-Core rev: 76f4be998f6608799b66821a334f1ca7ddc2aba2) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/mesa/mesa')
-rw-r--r--meta/recipes-graphics/mesa/mesa/cross2.patch46
-rw-r--r--meta/recipes-graphics/mesa/mesa/crossfix.patch18
-rw-r--r--meta/recipes-graphics/mesa/mesa/i586/matypes.h162
-rw-r--r--meta/recipes-graphics/mesa/mesa/uclibc.patch42
4 files changed, 268 insertions, 0 deletions
diff --git a/meta/recipes-graphics/mesa/mesa/cross2.patch b/meta/recipes-graphics/mesa/mesa/cross2.patch
new file mode 100644
index 0000000000..264c153087
--- /dev/null
+++ b/meta/recipes-graphics/mesa/mesa/cross2.patch
@@ -0,0 +1,46 @@
1Upstream-Status: Pending
2
3Index: git/configure.ac
4===================================================================
5--- git.orig/configure.ac 2009-09-01 16:38:26.000000000 +0100
6+++ git/configure.ac 2009-09-01 16:38:47.000000000 +0100
7@@ -269,15 +269,6 @@
8 GLAPI_ASM_SOURCES=""
9 AC_MSG_CHECKING([whether to enable assembly])
10 test "x$enable_asm" = xno && AC_MSG_RESULT([no])
11-# disable if cross compiling on x86/x86_64 since we must run gen_matypes
12-if test "x$enable_asm" = xyes && test "x$cross_compiling" = xyes; then
13- case "$host_cpu" in
14- i?86 | x86_64)
15- enable_asm=no
16- AC_MSG_RESULT([no, cross compiling])
17- ;;
18- esac
19-fi
20 # check for supported arches
21 if test "x$enable_asm" = xyes; then
22 case "$host_cpu" in
23Index: git/src/mesa/x86/Makefile
24===================================================================
25--- git.orig/src/mesa/x86/Makefile 2009-09-01 16:40:02.000000000 +0100
26+++ git/src/mesa/x86/Makefile 2009-09-01 16:40:13.000000000 +0100
27@@ -14,19 +14,6 @@
28 -I../tnl
29
30
31-default: gen_matypes matypes.h
32-
33-clean:
34- -rm -f matypes.h gen_matypes
35-
36-
37-gen_matypes: gen_matypes.c
38- $(HOST_CC) $(ARCH_FLAGS) $(INCLUDE_DIRS) $(HOST_CFLAGS) gen_matypes.c -o gen_matypes
39-
40-# need some special rules here, unfortunately
41-matypes.h: ../main/mtypes.h ../tnl/t_context.h gen_matypes
42- ./gen_matypes > matypes.h
43-
44 common_x86_asm.o: matypes.h
45 3dnow_normal.o: matypes.h
46 3dnow_xform1.o: matypes.h
diff --git a/meta/recipes-graphics/mesa/mesa/crossfix.patch b/meta/recipes-graphics/mesa/mesa/crossfix.patch
new file mode 100644
index 0000000000..d300e2f1b3
--- /dev/null
+++ b/meta/recipes-graphics/mesa/mesa/crossfix.patch
@@ -0,0 +1,18 @@
1Upstream-Status: Pending
2
3Index: Mesa-7.5/bin/mklib
4===================================================================
5--- Mesa-7.5.orig/bin/mklib 2009-08-12 13:01:34.000000000 +0100
6+++ Mesa-7.5/bin/mklib 2009-08-12 13:04:19.000000000 +0100
7@@ -234,9 +234,9 @@
8 if [ "x$LINK" = "x" ] ; then
9 # -linker was not specified so set default link command now
10 if [ $CPLUSPLUS = 1 ] ; then
11- LINK=g++
12+ LINK=$CXX
13 else
14- LINK=gcc
15+ LINK=$CC
16 fi
17 fi
18
diff --git a/meta/recipes-graphics/mesa/mesa/i586/matypes.h b/meta/recipes-graphics/mesa/mesa/i586/matypes.h
new file mode 100644
index 0000000000..98d2188e75
--- /dev/null
+++ b/meta/recipes-graphics/mesa/mesa/i586/matypes.h
@@ -0,0 +1,162 @@
1/*
2 * This file is automatically generated from the Mesa internal type
3 * definitions. Do not edit directly.
4 */
5
6#ifndef __ASM_TYPES_H__
7#define __ASM_TYPES_H__
8
9
10
11/* =============================================================
12 * Offsets for GLcontext
13 */
14
15#define CTX_DRIVER_CTX 996
16
17#define CTX_LIGHT_ENABLED 39404
18#define CTX_LIGHT_SHADE_MODEL 39408
19#define CTX_LIGHT_COLOR_MAT_FACE 39412
20#define CTX_LIGHT_COLOR_MAT_MODE 39416
21#define CTX_LIGHT_COLOR_MAT_MASK 39420
22#define CTX_LIGHT_COLOR_MAT_ENABLED 39424
23#define CTX_LIGHT_ENABLED_LIST 39432
24#define CTX_LIGHT_NEED_VERTS 43793
25#define CTX_LIGHT_FLAGS 43796
26#define CTX_LIGHT_BASE_COLOR 43800
27
28
29/* =============================================================
30 * Offsets for struct vertex_buffer
31 */
32
33#define VB_SIZE 0
34#define VB_COUNT 4
35
36#define VB_ELTS 8
37#define VB_OBJ_PTR 12
38#define VB_EYE_PTR 16
39#define VB_CLIP_PTR 20
40#define VB_PROJ_CLIP_PTR 24
41#define VB_CLIP_OR_MASK 28
42#define VB_CLIP_MASK 32
43#define VB_NORMAL_PTR 36
44#define VB_EDGE_FLAG 44
45#define VB_TEX0_COORD_PTR 48
46#define VB_TEX1_COORD_PTR 52
47#define VB_TEX2_COORD_PTR 56
48#define VB_TEX3_COORD_PTR 60
49#define VB_INDEX_PTR 80
50#define VB_COLOR_PTR 88
51#define VB_SECONDARY_COLOR_PTR 96
52#define VB_FOG_COORD_PTR 104
53#define VB_PRIMITIVE 108
54
55
56/*
57 * Flags for struct vertex_buffer
58 */
59
60#define VERT_BIT_OBJ 0x1
61#define VERT_BIT_NORM 0x4
62#define VERT_BIT_RGBA 0x8
63#define VERT_BIT_SPEC_RGB 0x10
64#define VERT_BIT_FOG_COORD 0x20
65#define VERT_BIT_TEX0 0x100
66#define VERT_BIT_TEX1 0x200
67#define VERT_BIT_TEX2 0x400
68#define VERT_BIT_TEX3 0x800
69
70
71/* =============================================================
72 * Offsets for GLvector4f
73 */
74
75#define V4F_DATA 0
76#define V4F_START 4
77#define V4F_COUNT 8
78#define V4F_STRIDE 12
79#define V4F_SIZE 16
80#define V4F_FLAGS 20
81
82/*
83 * Flags for GLvector4f
84 */
85
86#define VEC_MALLOC 0x10
87#define VEC_NOT_WRITEABLE 0x40
88#define VEC_BAD_STRIDE 0x100
89
90#define VEC_SIZE_1 0x1
91#define VEC_SIZE_2 0x3
92#define VEC_SIZE_3 0x7
93#define VEC_SIZE_4 0xf
94
95
96/* =============================================================
97 * Offsets for GLmatrix
98 */
99
100#define MATRIX_DATA 0
101#define MATRIX_INV 4
102#define MATRIX_FLAGS 8
103#define MATRIX_TYPE 12
104
105
106/* =============================================================
107 * Offsets for struct gl_light
108 */
109
110#define LIGHT_NEXT 0
111#define LIGHT_PREV 4
112
113#define LIGHT_AMBIENT 8
114#define LIGHT_DIFFUSE 24
115#define LIGHT_SPECULAR 40
116#define LIGHT_EYE_POSITION 56
117#define LIGHT_SPOT_DIRECTION 72
118#define LIGHT_SPOT_EXPONENT 88
119#define LIGHT_SPOT_CUTOFF 92
120#define LIGHT_COS_CUTOFF 100
121#define LIGHT_CONST_ATTEN 104
122#define LIGHT_LINEAR_ATTEN 108
123#define LIGHT_QUADRATIC_ATTEN 112
124#define LIGHT_ENABLED 116
125
126#define LIGHT_FLAGS 120
127
128#define LIGHT_POSITION 124
129#define LIGHT_VP_INF_NORM 140
130#define LIGHT_H_INF_NORM 152
131#define LIGHT_NORM_DIRECTION 164
132#define LIGHT_VP_INF_SPOT_ATTEN 180
133
134#define LIGHT_SPOT_EXP_TABLE 184
135#define LIGHT_MAT_AMBIENT 4280
136#define LIGHT_MAT_DIFFUSE 4304
137#define LIGHT_MAT_SPECULAR 4328
138
139#define SIZEOF_GL_LIGHT 4360
140
141/*
142 * Flags for struct gl_light
143 */
144
145#define LIGHT_SPOT 0x1
146#define LIGHT_LOCAL_VIEWER 0x2
147#define LIGHT_POSITIONAL 0x4
148
149#define LIGHT_NEED_VERTICES 0x6
150
151
152/* =============================================================
153 * Offsets for struct gl_lightmodel
154 */
155
156#define LIGHT_MODEL_AMBIENT 0
157#define LIGHT_MODEL_LOCAL_VIEWER 16
158#define LIGHT_MODEL_TWO_SIDE 17
159#define LIGHT_MODEL_COLOR_CONTROL 20
160
161
162#endif /* __ASM_TYPES_H__ */
diff --git a/meta/recipes-graphics/mesa/mesa/uclibc.patch b/meta/recipes-graphics/mesa/mesa/uclibc.patch
new file mode 100644
index 0000000000..49d0234ece
--- /dev/null
+++ b/meta/recipes-graphics/mesa/mesa/uclibc.patch
@@ -0,0 +1,42 @@
1Upstream-Status: Pending
2
3Index: Mesa-7.10.2/src/mesa/main/imports.c
4===================================================================
5--- Mesa-7.10.2.orig/src/mesa/main/imports.c 2011-03-01 12:57:29.000000000 -0800
6+++ Mesa-7.10.2/src/mesa/main/imports.c 2011-07-20 19:08:49.441785510 -0700
7@@ -757,7 +757,7 @@
8 float
9 _mesa_strtof( const char *s, char **end )
10 {
11-#if defined(_GNU_SOURCE) && !defined(__CYGWIN__) && !defined(__FreeBSD__)
12+#if defined(_GNU_SOURCE) && !defined(__CYGWIN__) && !defined(__FreeBSD__) && defined (HAVE_NEWLOCALE)
13 static locale_t loc = NULL;
14 if (!loc) {
15 loc = newlocale(LC_CTYPE_MASK, "C", NULL);
16Index: Mesa-7.10.2/src/glsl/strtod.c
17===================================================================
18--- Mesa-7.10.2.orig/src/glsl/strtod.c 2011-01-03 16:45:51.000000000 -0800
19+++ Mesa-7.10.2/src/glsl/strtod.c 2011-07-20 19:10:21.441785488 -0700
20@@ -44,7 +44,7 @@
21 double
22 glsl_strtod(const char *s, char **end)
23 {
24-#if defined(_GNU_SOURCE) && !defined(__CYGWIN__) && !defined(__FreeBSD__)
25+#if defined(_GNU_SOURCE) && !defined(__CYGWIN__) && !defined(__FreeBSD__) && defined (HAVE_NEWLOCALE)
26 static locale_t loc = NULL;
27 if (!loc) {
28 loc = newlocale(LC_CTYPE_MASK, "C", NULL);
29Index: Mesa-7.10.2/configure.ac
30===================================================================
31--- Mesa-7.10.2.orig/configure.ac 2011-07-20 19:09:02.000000000 -0700
32+++ Mesa-7.10.2/configure.ac 2011-07-20 19:09:57.121785492 -0700
33@@ -450,6 +450,9 @@
34 dnl See if posix_memalign is available
35 AC_CHECK_FUNC([posix_memalign], [DEFINES="$DEFINES -DHAVE_POSIX_MEMALIGN"])
36
37+dnl See if newlocale is available
38+AC_CHECK_FUNCS_ONCE(newlocale)
39+
40 dnl SELinux awareness.
41 AC_ARG_ENABLE([selinux],
42 [AS_HELP_STRING([--enable-selinux],
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-05-27 21:21:57 +0000