summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2019-06-01 13:26:23 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-06-02 10:23:50 +0100
commit6bf187a6c0f9974b8fe8d5ae796d8db8004d6c04 (patch)
tree5b9ec04176ce6aa502e0a44afbc92a0d30b6523c /meta/recipes-graphics
parent6560db9ddfd39a2715ede96430228306b00f53dd (diff)
downloadpoky-6bf187a6c0f9974b8fe8d5ae796d8db8004d6c04.tar.gz
mesa-demos: update to 8.4.0
(From OE-Core rev: fa51e660345ade5256a1c566ae387914ca1c109b) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics')
-rw-r--r--meta/recipes-graphics/mesa/mesa-demos/0007-Install-few-more-test-programs.patch26
-rw-r--r--meta/recipes-graphics/mesa/mesa-demos/0008-glsl-perf-Add-few-missing-.glsl-.vert-.frag-files-to.patch20
-rw-r--r--meta/recipes-graphics/mesa/mesa-demos/0009-glsl-perf-Install-.glsl-.vert-.frag-files.patch20
-rw-r--r--meta/recipes-graphics/mesa/mesa-demos_8.4.0.bb (renamed from meta/recipes-graphics/mesa/mesa-demos_8.3.0.bb)6
4 files changed, 33 insertions, 39 deletions
diff --git a/meta/recipes-graphics/mesa/mesa-demos/0007-Install-few-more-test-programs.patch b/meta/recipes-graphics/mesa/mesa-demos/0007-Install-few-more-test-programs.patch
index 6b676cdd20..b27d9eafa5 100644
--- a/meta/recipes-graphics/mesa/mesa-demos/0007-Install-few-more-test-programs.patch
+++ b/meta/recipes-graphics/mesa/mesa-demos/0007-Install-few-more-test-programs.patch
@@ -1,4 +1,4 @@
1From c59e286fa4e818ca015dd40e4725636309970ea8 Mon Sep 17 00:00:00 2001 1From 2e0367a941445a862ab99c54ec85d1357d0f73c0 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com> 2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Thu, 10 Jul 2014 14:30:52 +0200 3Date: Thu, 10 Jul 2014 14:30:52 +0200
4Subject: [PATCH] Install few more test programs 4Subject: [PATCH] Install few more test programs
@@ -8,27 +8,28 @@ Upstream-Status: Pending
8Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> 8Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
9 9
10Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> 10Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
11
11--- 12---
12 src/egl/opengl/Makefile.am | 2 +- 13 src/egl/opengl/Makefile.am | 3 +--
13 src/egl/opengles1/Makefile.am | 10 ++++------ 14 src/egl/openvg/Makefile.am | 2 +-
14 src/egl/openvg/Makefile.am | 2 +- 15 2 files changed, 2 insertions(+), 3 deletions(-)
15 3 files changed, 6 insertions(+), 8 deletions(-)
16 16
17diff --git a/src/egl/opengl/Makefile.am b/src/egl/opengl/Makefile.am 17diff --git a/src/egl/opengl/Makefile.am b/src/egl/opengl/Makefile.am
18index fe7faa9..3e48141 100644 18index 6d184ff6..ab09d028 100644
19--- a/src/egl/opengl/Makefile.am 19--- a/src/egl/opengl/Makefile.am
20+++ b/src/egl/opengl/Makefile.am 20+++ b/src/egl/opengl/Makefile.am
21@@ -50,7 +50,7 @@ endif 21@@ -57,8 +57,7 @@ endif
22 endif
23 22
24 if HAVE_EGL 23 if HAVE_EGL
24 bin_PROGRAMS = \
25- eglinfo
25-noinst_PROGRAMS = \ 26-noinst_PROGRAMS = \
26+bin_PROGRAMS = \ 27+ eglinfo \
27 eglinfo \
28 peglgears \ 28 peglgears \
29 $(EGL_DRM_DEMOS) \ 29 $(EGL_DRM_DEMOS) \
30 $(EGL_X11_DEMOS) \
30diff --git a/src/egl/openvg/Makefile.am b/src/egl/openvg/Makefile.am 31diff --git a/src/egl/openvg/Makefile.am b/src/egl/openvg/Makefile.am
31index b0f1212..5fd1cf8 100644 32index b0f1212f..5fd1cf83 100644
32--- a/src/egl/openvg/Makefile.am 33--- a/src/egl/openvg/Makefile.am
33+++ b/src/egl/openvg/Makefile.am 34+++ b/src/egl/openvg/Makefile.am
34@@ -49,7 +49,7 @@ endif 35@@ -49,7 +49,7 @@ endif
@@ -40,6 +41,3 @@ index b0f1212..5fd1cf8 100644
40 $(EGL_X11_DEMOS) 41 $(EGL_X11_DEMOS)
41 endif 42 endif
42 endif 43 endif
43--
442.1.4
45
diff --git a/meta/recipes-graphics/mesa/mesa-demos/0008-glsl-perf-Add-few-missing-.glsl-.vert-.frag-files-to.patch b/meta/recipes-graphics/mesa/mesa-demos/0008-glsl-perf-Add-few-missing-.glsl-.vert-.frag-files-to.patch
index a6085754d2..a6d168175f 100644
--- a/meta/recipes-graphics/mesa/mesa-demos/0008-glsl-perf-Add-few-missing-.glsl-.vert-.frag-files-to.patch
+++ b/meta/recipes-graphics/mesa/mesa-demos/0008-glsl-perf-Add-few-missing-.glsl-.vert-.frag-files-to.patch
@@ -1,12 +1,13 @@
1From 0b6f95f9b8ece22e9856c150e4be29fd86eaf546 Mon Sep 17 00:00:00 2001 1From 894add34c2b5e6b4ccc78996bf681d7ec7bc9e36 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com> 2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Thu, 10 Jul 2014 14:29:27 +0200 3Date: Thu, 10 Jul 2014 14:29:27 +0200
4Subject: [PATCH 8/9] glsl, perf: Add few missing .glsl, .vert, .frag files to 4Subject: [PATCH] glsl, perf: Add few missing .glsl, .vert, .frag files to
5 EXTRA_DATA 5 EXTRA_DATA
6 6
7Upstream-Status: Pending 7Upstream-Status: Pending
8 8
9Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> 9Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
10
10--- 11---
11 src/fpglsl/Makefile.am | 2 ++ 12 src/fpglsl/Makefile.am | 2 ++
12 src/glsl/Makefile.am | 10 ++++++++-- 13 src/glsl/Makefile.am | 10 ++++++++--
@@ -15,7 +16,7 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
15 4 files changed, 17 insertions(+), 2 deletions(-) 16 4 files changed, 17 insertions(+), 2 deletions(-)
16 17
17diff --git a/src/fpglsl/Makefile.am b/src/fpglsl/Makefile.am 18diff --git a/src/fpglsl/Makefile.am b/src/fpglsl/Makefile.am
18index 47c1039..fd43c91 100644 19index 47c1039f..fd43c919 100644
19--- a/src/fpglsl/Makefile.am 20--- a/src/fpglsl/Makefile.am
20+++ b/src/fpglsl/Makefile.am 21+++ b/src/fpglsl/Makefile.am
21@@ -39,10 +39,12 @@ noinst_PROGRAMS = \ 22@@ -39,10 +39,12 @@ noinst_PROGRAMS = \
@@ -32,7 +33,7 @@ index 47c1039..fd43c91 100644
32 mov-imm.glsl \ 33 mov-imm.glsl \
33 simpleif.glsl \ 34 simpleif.glsl \
34diff --git a/src/glsl/Makefile.am b/src/glsl/Makefile.am 35diff --git a/src/glsl/Makefile.am b/src/glsl/Makefile.am
35index 4faa8db..079a29d 100644 36index 4faa8dbf..079a29d8 100644
36--- a/src/glsl/Makefile.am 37--- a/src/glsl/Makefile.am
37+++ b/src/glsl/Makefile.am 38+++ b/src/glsl/Makefile.am
38@@ -37,7 +37,7 @@ AM_LDFLAGS = \ 39@@ -37,7 +37,7 @@ AM_LDFLAGS = \
@@ -71,13 +72,13 @@ index 4faa8db..079a29d 100644
71+ skinning.vert \ 72+ skinning.vert \
72 toyball.shtest 73 toyball.shtest
73diff --git a/src/perf/Makefile.am b/src/perf/Makefile.am 74diff --git a/src/perf/Makefile.am b/src/perf/Makefile.am
74index 5363c58..c5cca8d 100644 75index f0031fea..60069396 100644
75--- a/src/perf/Makefile.am 76--- a/src/perf/Makefile.am
76+++ b/src/perf/Makefile.am 77+++ b/src/perf/Makefile.am
77@@ -57,3 +57,9 @@ bin_PROGRAMS = \ 78@@ -59,3 +59,9 @@ endif
78 endif
79 79
80 glslstateschange_LDADD = libperf.la ../util/libutil.la 80 glslstateschange_LDADD = libperf.la ../util/libutil.la
81 glsl_compile_time_LDADD = ../util/libutil.la
81+ 82+
82+EXTRA_DIST = \ 83+EXTRA_DIST = \
83+ glslstateschange1.frag \ 84+ glslstateschange1.frag \
@@ -85,7 +86,7 @@ index 5363c58..c5cca8d 100644
85+ glslstateschange2.frag \ 86+ glslstateschange2.frag \
86+ glslstateschange2.vert 87+ glslstateschange2.vert
87diff --git a/src/vpglsl/Makefile.am b/src/vpglsl/Makefile.am 88diff --git a/src/vpglsl/Makefile.am b/src/vpglsl/Makefile.am
88index 4a85ed4..48b08f4 100644 89index 4a85ed40..48b08f48 100644
89--- a/src/vpglsl/Makefile.am 90--- a/src/vpglsl/Makefile.am
90+++ b/src/vpglsl/Makefile.am 91+++ b/src/vpglsl/Makefile.am
91@@ -44,6 +44,7 @@ EXTRA_DIST = \ 92@@ -44,6 +44,7 @@ EXTRA_DIST = \
@@ -96,6 +97,3 @@ index 4a85ed4..48b08f4 100644
96 mov.glsl \ 97 mov.glsl \
97 nestedifs.glsl \ 98 nestedifs.glsl \
98 nestedswizzle.glsl \ 99 nestedswizzle.glsl \
99--
1002.0.0
101
diff --git a/meta/recipes-graphics/mesa/mesa-demos/0009-glsl-perf-Install-.glsl-.vert-.frag-files.patch b/meta/recipes-graphics/mesa/mesa-demos/0009-glsl-perf-Install-.glsl-.vert-.frag-files.patch
index 1262dee237..8a98ba60d1 100644
--- a/meta/recipes-graphics/mesa/mesa-demos/0009-glsl-perf-Install-.glsl-.vert-.frag-files.patch
+++ b/meta/recipes-graphics/mesa/mesa-demos/0009-glsl-perf-Install-.glsl-.vert-.frag-files.patch
@@ -1,10 +1,11 @@
1From c8c3de5417d6b6c7d7579c528c0cab718f4bfdb6 Mon Sep 17 00:00:00 2001 1From 477ab6d90a17d8e4d3935be6ce8b8e154db0e3e5 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com> 2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Thu, 10 Jul 2014 14:48:12 +0200 3Date: Thu, 10 Jul 2014 14:48:12 +0200
4Subject: [PATCH 9/9] glsl, perf: Install .glsl, .vert, .frag files 4Subject: [PATCH] glsl, perf: Install .glsl, .vert, .frag files
5 5
6Upstream-Status: Pending 6Upstream-Status: Pending
7Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> 7Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
8
8--- 9---
9 src/fpglsl/Makefile.am | 3 ++- 10 src/fpglsl/Makefile.am | 3 ++-
10 src/glsl/Makefile.am | 3 ++- 11 src/glsl/Makefile.am | 3 ++-
@@ -13,7 +14,7 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
13 4 files changed, 8 insertions(+), 4 deletions(-) 14 4 files changed, 8 insertions(+), 4 deletions(-)
14 15
15diff --git a/src/fpglsl/Makefile.am b/src/fpglsl/Makefile.am 16diff --git a/src/fpglsl/Makefile.am b/src/fpglsl/Makefile.am
16index fd43c91..2bf51de 100644 17index fd43c919..2bf51de4 100644
17--- a/src/fpglsl/Makefile.am 18--- a/src/fpglsl/Makefile.am
18+++ b/src/fpglsl/Makefile.am 19+++ b/src/fpglsl/Makefile.am
19@@ -38,7 +38,8 @@ noinst_PROGRAMS = \ 20@@ -38,7 +38,8 @@ noinst_PROGRAMS = \
@@ -27,7 +28,7 @@ index fd43c91..2bf51de 100644
27 dowhile2.glsl \ 28 dowhile2.glsl \
28 dowhile.glsl \ 29 dowhile.glsl \
29diff --git a/src/glsl/Makefile.am b/src/glsl/Makefile.am 30diff --git a/src/glsl/Makefile.am b/src/glsl/Makefile.am
30index 079a29d..f66ec29 100644 31index 079a29d8..f66ec299 100644
31--- a/src/glsl/Makefile.am 32--- a/src/glsl/Makefile.am
32+++ b/src/glsl/Makefile.am 33+++ b/src/glsl/Makefile.am
33@@ -118,7 +118,8 @@ vert_or_frag_only_LDADD = ../util/libutil.la 34@@ -118,7 +118,8 @@ vert_or_frag_only_LDADD = ../util/libutil.la
@@ -41,12 +42,12 @@ index 079a29d..f66ec29 100644
41 CH06-brick.vert \ 42 CH06-brick.vert \
42 CH11-bumpmap.frag \ 43 CH11-bumpmap.frag \
43diff --git a/src/perf/Makefile.am b/src/perf/Makefile.am 44diff --git a/src/perf/Makefile.am b/src/perf/Makefile.am
44index c5cca8d..140256d 100644 45index 60069396..469bdf45 100644
45--- a/src/perf/Makefile.am 46--- a/src/perf/Makefile.am
46+++ b/src/perf/Makefile.am 47+++ b/src/perf/Makefile.am
47@@ -58,7 +58,8 @@ endif 48@@ -60,7 +60,8 @@ endif
48
49 glslstateschange_LDADD = libperf.la ../util/libutil.la 49 glslstateschange_LDADD = libperf.la ../util/libutil.la
50 glsl_compile_time_LDADD = ../util/libutil.la
50 51
51-EXTRA_DIST = \ 52-EXTRA_DIST = \
52+demosdatadir=$(datadir)/$(PACKAGE)/ 53+demosdatadir=$(datadir)/$(PACKAGE)/
@@ -55,7 +56,7 @@ index c5cca8d..140256d 100644
55 glslstateschange1.vert \ 56 glslstateschange1.vert \
56 glslstateschange2.frag \ 57 glslstateschange2.frag \
57diff --git a/src/vpglsl/Makefile.am b/src/vpglsl/Makefile.am 58diff --git a/src/vpglsl/Makefile.am b/src/vpglsl/Makefile.am
58index 48b08f4..5526867 100644 59index 48b08f48..55268675 100644
59--- a/src/vpglsl/Makefile.am 60--- a/src/vpglsl/Makefile.am
60+++ b/src/vpglsl/Makefile.am 61+++ b/src/vpglsl/Makefile.am
61@@ -38,7 +38,8 @@ noinst_PROGRAMS = \ 62@@ -38,7 +38,8 @@ noinst_PROGRAMS = \
@@ -68,6 +69,3 @@ index 48b08f4..5526867 100644
68 for.glsl \ 69 for.glsl \
69 func.glsl \ 70 func.glsl \
70 func2.glsl \ 71 func2.glsl \
71--
722.0.0
73
diff --git a/meta/recipes-graphics/mesa/mesa-demos_8.3.0.bb b/meta/recipes-graphics/mesa/mesa-demos_8.4.0.bb
index bae3b18bea..129a47df48 100644
--- a/meta/recipes-graphics/mesa/mesa-demos_8.3.0.bb
+++ b/meta/recipes-graphics/mesa/mesa-demos_8.4.0.bb
@@ -9,7 +9,7 @@ LICENSE = "MIT & PD"
9LIC_FILES_CHKSUM = "file://src/xdemos/glxgears.c;beginline=1;endline=20;md5=914225785450eff644a86c871d3ae00e \ 9LIC_FILES_CHKSUM = "file://src/xdemos/glxgears.c;beginline=1;endline=20;md5=914225785450eff644a86c871d3ae00e \
10 file://src/xdemos/glxdemo.c;beginline=1;endline=8;md5=b01d5ab1aee94d35b7efaa2ef48e1a06" 10 file://src/xdemos/glxdemo.c;beginline=1;endline=8;md5=b01d5ab1aee94d35b7efaa2ef48e1a06"
11 11
12SRC_URI = "https://mesa.freedesktop.org/archive/demos/${PV}/${BPN}-${PV}.tar.bz2 \ 12SRC_URI = "https://mesa.freedesktop.org/archive/demos/${BPN}-${PV}.tar.bz2 \
13 file://0001-mesa-demos-Add-missing-data-files.patch \ 13 file://0001-mesa-demos-Add-missing-data-files.patch \
14 file://0003-configure-Allow-to-disable-demos-which-require-GLEW-.patch \ 14 file://0003-configure-Allow-to-disable-demos-which-require-GLEW-.patch \
15 file://0004-Use-DEMOS_DATA_DIR-to-locate-data-files.patch \ 15 file://0004-Use-DEMOS_DATA_DIR-to-locate-data-files.patch \
@@ -19,8 +19,8 @@ SRC_URI = "https://mesa.freedesktop.org/archive/demos/${PV}/${BPN}-${PV}.tar.bz2
19 file://0012-mesa-demos-OpenVG-demos-with-single-frame-need-eglSw.patch \ 19 file://0012-mesa-demos-OpenVG-demos-with-single-frame-need-eglSw.patch \
20 file://0013-only-build-GLX-demos-if-needed.patch \ 20 file://0013-only-build-GLX-demos-if-needed.patch \
21 " 21 "
22SRC_URI[md5sum] = "628e75c23c17394f11a316c36f8e4164" 22SRC_URI[md5sum] = "6b65a02622765522176d00f553086fa3"
23SRC_URI[sha256sum] = "c173154bbd0d5fb53d732471984def42fb1b14ac85fcb834138fb9518b3e0bef" 23SRC_URI[sha256sum] = "01e99c94a0184e63e796728af89bfac559795fb2a0d6f506fa900455ca5fff7d"
24 24
25inherit autotools pkgconfig distro_features_check 25inherit autotools pkgconfig distro_features_check
26# depends on virtual/egl, virtual/libgl ... 26# depends on virtual/egl, virtual/libgl ...