diff options
author | Martin Jansa <martin.jansa@gmail.com> | 2013-07-02 13:49:19 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-07-05 15:34:26 +0100 |
commit | 4ec1014cc0aadd66fffa2667e5c59ea8b876eb61 (patch) | |
tree | a53f964c3029e873c5d4e8ce36b60685a1a76e92 /meta/recipes-graphics/mesa/mesa | |
parent | 52892d6f8a2f37bf6b809bcbf3ad6442e152f3fb (diff) | |
download | poky-4ec1014cc0aadd66fffa2667e5c59ea8b876eb61.tar.gz |
mesa: bump SRCREV in git recipe, refresh patches
* 0003-EGL-Mutate-NativeDisplayType-depending-on-config.patch
needs to be rebased so move old version for 9.1.3 to
mesa-9.1.3/ and update the version in mesa/
* add git headers
* 0005-llvmpipe-remove-the-power-of-two-sizeof-struct-cmd_b.patch
is already applied in new SRCREV, move it to mesa-9.1.3/
* formal change in license.html with new SRCREV:
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
(From OE-Core rev: 7c60607c898f596731441425d75144be232d4c8e)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.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/0001-configure-Avoid-use-of-AC_CHECK_FILE-for-cross-compi.patch | 14 | ||||
-rw-r--r-- | meta/recipes-graphics/mesa/mesa/0001-llvmpipe-remove-the-power-of-two-sizeof-struct-cmd_b.patch | 42 | ||||
-rw-r--r-- | meta/recipes-graphics/mesa/mesa/0003-EGL-Mutate-NativeDisplayType-depending-on-config.patch (renamed from meta/recipes-graphics/mesa/mesa/EGL-Mutate-NativeDisplayType-depending-on-config.patch) | 44 | ||||
-rw-r--r-- | meta/recipes-graphics/mesa/mesa/0004-glsl-fix-builtin_compiler-cross-compilation.patch (renamed from meta/recipes-graphics/mesa/mesa/fix-glsl-cross.patch) | 13 |
4 files changed, 40 insertions, 73 deletions
diff --git a/meta/recipes-graphics/mesa/mesa/0001-configure-Avoid-use-of-AC_CHECK_FILE-for-cross-compi.patch b/meta/recipes-graphics/mesa/mesa/0001-configure-Avoid-use-of-AC_CHECK_FILE-for-cross-compi.patch index 9f7002a028..76b5a18ede 100644 --- a/meta/recipes-graphics/mesa/mesa/0001-configure-Avoid-use-of-AC_CHECK_FILE-for-cross-compi.patch +++ b/meta/recipes-graphics/mesa/mesa/0001-configure-Avoid-use-of-AC_CHECK_FILE-for-cross-compi.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 877b8ea9a79d1d51f8e6b032801731538590d39e Mon Sep 17 00:00:00 2001 | 1 | From e21ce89f7ae6964f196086ff325d79e4a3b5acd8 Mon Sep 17 00:00:00 2001 |
2 | From: Jonathan Liu <net147@gmail.com> | 2 | From: Jonathan Liu <net147@gmail.com> |
3 | Date: Tue, 4 Jun 2013 06:04:44 -0700 | 3 | Date: Tue, 4 Jun 2013 06:04:44 -0700 |
4 | Subject: [PATCH] configure: Avoid use of AC_CHECK_FILE for cross compiling | 4 | Subject: [PATCH 1/4] configure: Avoid use of AC_CHECK_FILE for cross compiling |
5 | 5 | ||
6 | The AC_CHECK_FILE macro can't be used for cross compiling as it will | 6 | The AC_CHECK_FILE macro can't be used for cross compiling as it will |
7 | result in "error: cannot check for file existence when cross compiling". | 7 | result in "error: cannot check for file existence when cross compiling". |
@@ -17,10 +17,10 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | |||
17 | 1 file changed, 6 insertions(+), 6 deletions(-) | 17 | 1 file changed, 6 insertions(+), 6 deletions(-) |
18 | 18 | ||
19 | diff --git a/configure.ac b/configure.ac | 19 | diff --git a/configure.ac b/configure.ac |
20 | index 36065f1..2b4a374 100644 | 20 | index 70c598e..67b8c40 100644 |
21 | --- a/configure.ac | 21 | --- a/configure.ac |
22 | +++ b/configure.ac | 22 | +++ b/configure.ac |
23 | @@ -1694,8 +1694,8 @@ if test "x$enable_gallium_llvm" = xyes; then | 23 | @@ -1630,8 +1630,8 @@ if test "x$enable_gallium_llvm" = xyes; then |
24 | CLANG_LIBDIR=${LLVM_LIBDIR} | 24 | CLANG_LIBDIR=${LLVM_LIBDIR} |
25 | fi | 25 | fi |
26 | CLANG_RESOURCE_DIR=$CLANG_LIBDIR/clang/${LLVM_VERSION} | 26 | CLANG_RESOURCE_DIR=$CLANG_LIBDIR/clang/${LLVM_VERSION} |
@@ -31,7 +31,7 @@ index 36065f1..2b4a374 100644 | |||
31 | fi | 31 | fi |
32 | else | 32 | else |
33 | MESA_LLVM=0 | 33 | MESA_LLVM=0 |
34 | @@ -1912,7 +1912,7 @@ if test "x$MESA_LLVM" != x0; then | 34 | @@ -1861,7 +1861,7 @@ if test "x$MESA_LLVM" != x0; then |
35 | if test "x$with_llvm_shared_libs" = xyes; then | 35 | if test "x$with_llvm_shared_libs" = xyes; then |
36 | dnl We can't use $LLVM_VERSION because it has 'svn' stripped out, | 36 | dnl We can't use $LLVM_VERSION because it has 'svn' stripped out, |
37 | LLVM_SO_NAME=LLVM-`$LLVM_CONFIG --version` | 37 | LLVM_SO_NAME=LLVM-`$LLVM_CONFIG --version` |
@@ -40,7 +40,7 @@ index 36065f1..2b4a374 100644 | |||
40 | 40 | ||
41 | if test "x$llvm_have_one_so" = xyes; then | 41 | if test "x$llvm_have_one_so" = xyes; then |
42 | dnl LLVM was built using auto*, so there is only one shared object. | 42 | dnl LLVM was built using auto*, so there is only one shared object. |
43 | @@ -1920,8 +1920,8 @@ if test "x$MESA_LLVM" != x0; then | 43 | @@ -1869,8 +1869,8 @@ if test "x$MESA_LLVM" != x0; then |
44 | else | 44 | else |
45 | dnl If LLVM was built with CMake, there will be one shared object per | 45 | dnl If LLVM was built with CMake, there will be one shared object per |
46 | dnl component. | 46 | dnl component. |
@@ -51,7 +51,7 @@ index 36065f1..2b4a374 100644 | |||
51 | Please make sure you have built llvm with the --enable-shared option | 51 | Please make sure you have built llvm with the --enable-shared option |
52 | and that your llvm libraries are installed in $LLVM_LIBDIR | 52 | and that your llvm libraries are installed in $LLVM_LIBDIR |
53 | If you have installed your llvm libraries to a different directory you | 53 | If you have installed your llvm libraries to a different directory you |
54 | @@ -1932,7 +1932,7 @@ if test "x$MESA_LLVM" != x0; then | 54 | @@ -1881,7 +1881,7 @@ if test "x$MESA_LLVM" != x0; then |
55 | --enable-opencl | 55 | --enable-opencl |
56 | If you do not want to build with llvm shared libraries and instead want to | 56 | If you do not want to build with llvm shared libraries and instead want to |
57 | use llvm static libraries then remove these options from your configure | 57 | use llvm static libraries then remove these options from your configure |
diff --git a/meta/recipes-graphics/mesa/mesa/0001-llvmpipe-remove-the-power-of-two-sizeof-struct-cmd_b.patch b/meta/recipes-graphics/mesa/mesa/0001-llvmpipe-remove-the-power-of-two-sizeof-struct-cmd_b.patch deleted file mode 100644 index b74fddc5ea..0000000000 --- a/meta/recipes-graphics/mesa/mesa/0001-llvmpipe-remove-the-power-of-two-sizeof-struct-cmd_b.patch +++ /dev/null | |||
@@ -1,42 +0,0 @@ | |||
1 | From 9915636fb8afe75ee2e8e013e4f495a4cb937afb Mon Sep 17 00:00:00 2001 | ||
2 | From: Brian Paul <brianp@vmware.com> | ||
3 | Date: Wed, 6 Mar 2013 16:57:20 -0700 | ||
4 | Subject: [PATCH] llvmpipe: remove the power of two sizeof(struct cmd_block) | ||
5 | assertion | ||
6 | MIME-Version: 1.0 | ||
7 | Content-Type: text/plain; charset=UTF-8 | ||
8 | Content-Transfer-Encoding: 8bit | ||
9 | |||
10 | It fails on 32-bit systems (I only tested on 64-bit). Power of two | ||
11 | size isn't required, so just remove the assertion. | ||
12 | |||
13 | Reviewed-by: José Fonseca <jfonseca@vmware.com> | ||
14 | |||
15 | Upstream-Status: Backport | ||
16 | http://cgit.freedesktop.org/mesa/mesa/commit/?id=9915636fb8afe75ee2e8e013e4f495a4cb937afb | ||
17 | |||
18 | --- | ||
19 | src/gallium/drivers/llvmpipe/lp_scene.c | 7 ------- | ||
20 | 1 file changed, 7 deletions(-) | ||
21 | |||
22 | diff --git a/src/gallium/drivers/llvmpipe/lp_scene.c b/src/gallium/drivers/llvmpipe/lp_scene.c | ||
23 | index dd0943e..a0912eb 100644 | ||
24 | --- a/src/gallium/drivers/llvmpipe/lp_scene.c | ||
25 | +++ b/src/gallium/drivers/llvmpipe/lp_scene.c | ||
26 | @@ -76,13 +76,6 @@ lp_scene_create( struct pipe_context *pipe ) | ||
27 | assert(maxCommandBytes < LP_SCENE_MAX_SIZE); | ||
28 | /* We'll also need space for at least one other data block */ | ||
29 | assert(maxCommandPlusData <= LP_SCENE_MAX_SIZE); | ||
30 | - | ||
31 | - /* Ideally, the size of a cmd_block object will be a power of two | ||
32 | - * in order to avoid wasting space when we allocation them from | ||
33 | - * data blocks (which are power of two also). | ||
34 | - */ | ||
35 | - assert(sizeof(struct cmd_block) == | ||
36 | - util_next_power_of_two(sizeof(struct cmd_block))); | ||
37 | } | ||
38 | #endif | ||
39 | |||
40 | -- | ||
41 | 1.8.3 | ||
42 | |||
diff --git a/meta/recipes-graphics/mesa/mesa/EGL-Mutate-NativeDisplayType-depending-on-config.patch b/meta/recipes-graphics/mesa/mesa/0003-EGL-Mutate-NativeDisplayType-depending-on-config.patch index 47ba1671bc..d6ddd9a0d4 100644 --- a/meta/recipes-graphics/mesa/mesa/EGL-Mutate-NativeDisplayType-depending-on-config.patch +++ b/meta/recipes-graphics/mesa/mesa/0003-EGL-Mutate-NativeDisplayType-depending-on-config.patch | |||
@@ -1,51 +1,49 @@ | |||
1 | From d52a7ec5dcdf3936bd727b854831efb90acfd2ba Mon Sep 17 00:00:00 2001 | 1 | From 8d31ae23683394617c49301b039b3a069b9ea436 Mon Sep 17 00:00:00 2001 |
2 | From: Daniel Stone <daniel@fooishbar.org> | 2 | From: Daniel Stone <daniel@fooishbar.org> |
3 | Date: Fri, 24 May 2013 17:20:27 +0100 | 3 | Date: Fri, 24 May 2013 17:20:27 +0100 |
4 | Subject: [PATCH] EGL: Mutate NativeDisplayType depending on config | 4 | Subject: [PATCH 3/4] EGL: Mutate NativeDisplayType depending on config |
5 | 5 | ||
6 | If we go through ./configure without enabling X11 anywhere, then set the | 6 | If we go through ./configure without enabling X11 anywhere, then set the |
7 | fallback types for EGL NativeDisplay and friends, rather than assuming | 7 | fallback types for EGL NativeDisplay and friends, rather than assuming |
8 | X11/Xlib. | 8 | X11/Xlib. |
9 | 9 | ||
10 | Signed-off-by: Daniel Stone <daniel@fooishbar.org> | 10 | Signed-off-by: Daniel Stone <daniel@fooishbar.org> |
11 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
11 | --- | 12 | --- |
12 | configure.ac | 9 +++ | 13 | configure.ac | 5 ++ |
13 | include/EGL/eglplatform.h | 146 ------------------------------------------ | 14 | include/EGL/eglplatform.h | 146 ------------------------------------------- |
14 | include/EGL/eglplatform.h.in | 146 ++++++++++++++++++++++++++++++++++++++++++ | 15 | include/EGL/eglplatform.h.in | 146 +++++++++++++++++++++++++++++++++++++++++++ |
15 | 3 files changed, 155 insertions(+), 146 deletions(-) | 16 | 3 files changed, 151 insertions(+), 146 deletions(-) |
16 | delete mode 100644 include/EGL/eglplatform.h | 17 | delete mode 100644 include/EGL/eglplatform.h |
17 | create mode 100644 include/EGL/eglplatform.h.in | 18 | create mode 100644 include/EGL/eglplatform.h.in |
18 | 19 | ||
19 | diff --git a/configure.ac b/configure.ac | 20 | diff --git a/configure.ac b/configure.ac |
20 | index 4a98996..6fa77da 100644 | 21 | index 67b8c40..afc3217 100644 |
21 | --- a/configure.ac | 22 | --- a/configure.ac |
22 | +++ b/configure.ac | 23 | +++ b/configure.ac |
23 | @@ -1576,12 +1576,20 @@ fi | 24 | @@ -1499,6 +1499,9 @@ EGL_PLATFORMS="$egl_platforms" |
24 | 25 | ||
25 | EGL_PLATFORMS="$egl_platforms" | 26 | if echo "$egl_platforms" | grep 'x11' >/dev/null 2>&1; then |
26 | 27 | NEED_WINSYS_XLIB=yes | |
27 | +if echo "$egl_platforms" | grep 'x11' >/dev/null 2>&1; then | ||
28 | + MESA_EGL_NO_X11_HEADERS=0 | 28 | + MESA_EGL_NO_X11_HEADERS=0 |
29 | +else | 29 | +else |
30 | + MESA_EGL_NO_X11_HEADERS=1 | 30 | + MESA_EGL_NO_X11_HEADERS=1 |
31 | +fi | 31 | fi |
32 | + | ||
33 | AM_CONDITIONAL(HAVE_EGL_PLATFORM_X11, echo "$egl_platforms" | grep 'x11' >/dev/null 2>&1) | 32 | AM_CONDITIONAL(HAVE_EGL_PLATFORM_X11, echo "$egl_platforms" | grep 'x11' >/dev/null 2>&1) |
34 | AM_CONDITIONAL(HAVE_EGL_PLATFORM_WAYLAND, echo "$egl_platforms" | grep 'wayland' >/dev/null 2>&1) | 33 | AM_CONDITIONAL(HAVE_EGL_PLATFORM_WAYLAND, echo "$egl_platforms" | grep 'wayland' >/dev/null 2>&1) |
35 | AM_CONDITIONAL(HAVE_EGL_PLATFORM_DRM, echo "$egl_platforms" | grep 'drm' >/dev/null 2>&1) | 34 | @@ -1512,6 +1515,7 @@ AM_CONDITIONAL(HAVE_EGL_DRIVER_GLX, test "x$HAVE_EGL_DRIVER_GLX" != "x") |
36 | AM_CONDITIONAL(HAVE_EGL_PLATFORM_FBDEV, echo "$egl_platforms" | grep 'fbdev' >/dev/null 2>&1) | 35 | AC_SUBST([EGL_NATIVE_PLATFORM]) |
37 | AM_CONDITIONAL(HAVE_EGL_PLATFORM_NULL, echo "$egl_platforms" | grep 'null' >/dev/null 2>&1) | 36 | AC_SUBST([EGL_PLATFORMS]) |
38 | 37 | AC_SUBST([EGL_CFLAGS]) | |
39 | +AC_SUBST([MESA_EGL_NO_X11_HEADERS]) | 38 | +AC_SUBST([MESA_EGL_NO_X11_HEADERS]) |
40 | + | ||
41 | AM_CONDITIONAL(HAVE_EGL_DRIVER_DRI2, test "x$HAVE_EGL_DRIVER_DRI2" != "x") | ||
42 | AM_CONDITIONAL(HAVE_EGL_DRIVER_GLX, test "x$HAVE_EGL_DRIVER_GLX" != "x") | ||
43 | 39 | ||
44 | @@ -2053,6 +2061,7 @@ CXXFLAGS="$CXXFLAGS $USER_CXXFLAGS" | 40 | AC_ARG_WITH([egl-driver-dir], |
41 | [AS_HELP_STRING([--with-egl-driver-dir=DIR], | ||
42 | @@ -1991,6 +1995,7 @@ CXXFLAGS="$CXXFLAGS $USER_CXXFLAGS" | ||
45 | 43 | ||
46 | dnl Substitute the config | 44 | dnl Substitute the config |
47 | AC_CONFIG_FILES([Makefile | 45 | AC_CONFIG_FILES([Makefile |
48 | + include/EGL/eglplatform.h | 46 | + include/EGL/eglplatform.h |
49 | src/Makefile | 47 | src/Makefile |
50 | src/egl/Makefile | 48 | src/egl/Makefile |
51 | src/egl/drivers/Makefile | 49 | src/egl/drivers/Makefile |
@@ -354,5 +352,5 @@ index 0000000..5126c92 | |||
354 | + | 352 | + |
355 | +#endif /* __eglplatform_h */ | 353 | +#endif /* __eglplatform_h */ |
356 | -- | 354 | -- |
357 | 1.7.10.4 | 355 | 1.8.2.1 |
358 | 356 | ||
diff --git a/meta/recipes-graphics/mesa/mesa/fix-glsl-cross.patch b/meta/recipes-graphics/mesa/mesa/0004-glsl-fix-builtin_compiler-cross-compilation.patch index 34226ea58b..460a2748bf 100644 --- a/meta/recipes-graphics/mesa/mesa/fix-glsl-cross.patch +++ b/meta/recipes-graphics/mesa/mesa/0004-glsl-fix-builtin_compiler-cross-compilation.patch | |||
@@ -1,9 +1,17 @@ | |||
1 | From ab38c97f057f739533a4e1fc9de51ea5f4e6242d Mon Sep 17 00:00:00 2001 | ||
2 | From: Jonathan Liu <net147@gmail.com> | ||
3 | Date: Sat, 29 Jun 2013 11:37:20 +0200 | ||
4 | Subject: [PATCH 4/4] glsl: fix builtin_compiler cross-compilation | ||
5 | |||
1 | The target libtool is used when building host binaries, which predictably | 6 | The target libtool is used when building host binaries, which predictably |
2 | doesn't work. | 7 | doesn't work. |
3 | 8 | ||
4 | Upstream-Status: Submitted (https://bugs.freedesktop.org/show_bug.cgi?id=44618) | 9 | Upstream-Status: Submitted https://bugs.freedesktop.org/show_bug.cgi?id=44618 |
5 | Signed-off-by: Jonathan Liu <net147@gmail.com> | 10 | Signed-off-by: Jonathan Liu <net147@gmail.com> |
6 | Signed-off-by: Ross Burton <ross.burton@intel.com> | 11 | Signed-off-by: Ross Burton <ross.burton@intel.com> |
12 | --- | ||
13 | src/glsl/builtin_compiler/Makefile.am | 13 +++++++++++++ | ||
14 | 1 file changed, 13 insertions(+) | ||
7 | 15 | ||
8 | diff --git a/src/glsl/builtin_compiler/Makefile.am b/src/glsl/builtin_compiler/Makefile.am | 16 | diff --git a/src/glsl/builtin_compiler/Makefile.am b/src/glsl/builtin_compiler/Makefile.am |
9 | index e11a17f..8ebe0a2 100644 | 17 | index e11a17f..8ebe0a2 100644 |
@@ -41,3 +49,6 @@ index e11a17f..8ebe0a2 100644 | |||
41 | +else | 49 | +else |
42 | builtin_compiler_LDADD = libglslcore.la libglcpp.la | 50 | builtin_compiler_LDADD = libglslcore.la libglcpp.la |
43 | +endif | 51 | +endif |
52 | -- | ||
53 | 1.8.2.1 | ||
54 | |||