diff options
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-graphics/kmscube/kmscube/detect-gst_bo_map-_unmap-and-use-it-or-avoid-it.patch | 25 | ||||
-rw-r--r-- | meta/recipes-graphics/kmscube/kmscube_git.bb | 4 |
2 files changed, 15 insertions, 14 deletions
diff --git a/meta/recipes-graphics/kmscube/kmscube/detect-gst_bo_map-_unmap-and-use-it-or-avoid-it.patch b/meta/recipes-graphics/kmscube/kmscube/detect-gst_bo_map-_unmap-and-use-it-or-avoid-it.patch index 611e541598..a7a08f14e6 100644 --- a/meta/recipes-graphics/kmscube/kmscube/detect-gst_bo_map-_unmap-and-use-it-or-avoid-it.patch +++ b/meta/recipes-graphics/kmscube/kmscube/detect-gst_bo_map-_unmap-and-use-it-or-avoid-it.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 761bf993ca55095f46380c0238583791c1797295 Mon Sep 17 00:00:00 2001 | 1 | From a91c588b5a4122506e7fe949c37d530621bdd997 Mon Sep 17 00:00:00 2001 |
2 | From: =?UTF-8?q?Daniel=20D=C3=ADaz?= <daniel.diaz@linaro.org> | 2 | From: =?UTF-8?q?Daniel=20D=C3=ADaz?= <daniel.diaz@linaro.org> |
3 | Date: Tue, 11 Jul 2017 14:50:37 -0500 | 3 | Date: Tue, 11 Jul 2017 14:50:37 -0500 |
4 | Subject: [PATCH kmscube] Detect gst_bo_map/_unmap and use it (or avoid it) | 4 | Subject: [PATCH] Detect gst_bo_map/_unmap and use it (or avoid it) |
5 | MIME-Version: 1.0 | 5 | MIME-Version: 1.0 |
6 | Content-Type: text/plain; charset=UTF-8 | 6 | Content-Type: text/plain; charset=UTF-8 |
7 | Content-Transfer-Encoding: 8bit | 7 | Content-Transfer-Encoding: 8bit |
@@ -18,6 +18,7 @@ Cc: Rob Clark <robdclark@gmail.com> | |||
18 | Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com> | 18 | Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com> |
19 | 19 | ||
20 | Upstream-Status: Submitted [https://lists.freedesktop.org/archives/mesa-dev/2017-July/163020.html] | 20 | Upstream-Status: Submitted [https://lists.freedesktop.org/archives/mesa-dev/2017-July/163020.html] |
21 | Signed-off-by: Zoltan Kuscsik <zoltan.kuscsik@solution57.com> | ||
21 | --- | 22 | --- |
22 | Makefile.am | 5 ++++- | 23 | Makefile.am | 5 ++++- |
23 | configure.ac | 3 +++ | 24 | configure.ac | 3 +++ |
@@ -26,7 +27,7 @@ Upstream-Status: Submitted [https://lists.freedesktop.org/archives/mesa-dev/2017 | |||
26 | 4 files changed, 17 insertions(+), 2 deletions(-) | 27 | 4 files changed, 17 insertions(+), 2 deletions(-) |
27 | 28 | ||
28 | diff --git a/Makefile.am b/Makefile.am | 29 | diff --git a/Makefile.am b/Makefile.am |
29 | index a36087d..ab4adbf 100644 | 30 | index ba064e4..3a0a50b 100644 |
30 | --- a/Makefile.am | 31 | --- a/Makefile.am |
31 | +++ b/Makefile.am | 32 | +++ b/Makefile.am |
32 | @@ -43,7 +43,6 @@ kmscube_SOURCES = \ | 33 | @@ -43,7 +43,6 @@ kmscube_SOURCES = \ |
@@ -37,16 +38,16 @@ index a36087d..ab4adbf 100644 | |||
37 | drm-atomic.c \ | 38 | drm-atomic.c \ |
38 | drm-common.c \ | 39 | drm-common.c \ |
39 | drm-common.h \ | 40 | drm-common.h \ |
40 | @@ -59,3 +58,7 @@ kmscube_LDADD += $(GST_LIBS) | 41 | @@ -68,3 +67,7 @@ texturator_SOURCES = \ |
41 | kmscube_CFLAGS += $(GST_CFLAGS) | 42 | drm-common.c \ |
42 | kmscube_SOURCES += cube-video.c gst-decoder.c | 43 | drm-legacy.c \ |
43 | endif | 44 | texturator.c |
44 | + | 45 | + |
45 | +if ENABLE_GBM_MAP | 46 | +if ENABLE_GBM_MAP |
46 | +kmscube_SOURCES += cube-tex.c | 47 | +kmscube_SOURCES += cube-tex.c |
47 | +endif | 48 | +endif |
48 | diff --git a/configure.ac b/configure.ac | 49 | diff --git a/configure.ac b/configure.ac |
49 | index 8397f7b..c7f1f4d 100644 | 50 | index 6be6541..3d20121 100644 |
50 | --- a/configure.ac | 51 | --- a/configure.ac |
51 | +++ b/configure.ac | 52 | +++ b/configure.ac |
52 | @@ -49,5 +49,8 @@ if test "x$HAVE_GST" = "xyes"; then | 53 | @@ -49,5 +49,8 @@ if test "x$HAVE_GST" = "xyes"; then |
@@ -59,7 +60,7 @@ index 8397f7b..c7f1f4d 100644 | |||
59 | AC_CONFIG_FILES([Makefile]) | 60 | AC_CONFIG_FILES([Makefile]) |
60 | AC_OUTPUT | 61 | AC_OUTPUT |
61 | diff --git a/gst-decoder.c b/gst-decoder.c | 62 | diff --git a/gst-decoder.c b/gst-decoder.c |
62 | index 2d6d581..b84980e 100644 | 63 | index 5431014..0aa7a55 100644 |
63 | --- a/gst-decoder.c | 64 | --- a/gst-decoder.c |
64 | +++ b/gst-decoder.c | 65 | +++ b/gst-decoder.c |
65 | @@ -332,6 +332,7 @@ set_last_frame(struct decoder *dec, EGLImage frame, GstSample *samp) | 66 | @@ -332,6 +332,7 @@ set_last_frame(struct decoder *dec, EGLImage frame, GstSample *samp) |
@@ -96,10 +97,10 @@ index 2d6d581..b84980e 100644 | |||
96 | if (dmabuf_fd < 0) { | 97 | if (dmabuf_fd < 0) { |
97 | GST_ERROR("could not obtain DMABUF FD"); | 98 | GST_ERROR("could not obtain DMABUF FD"); |
98 | diff --git a/kmscube.c b/kmscube.c | 99 | diff --git a/kmscube.c b/kmscube.c |
99 | index 3a2c4dd..276dc55 100644 | 100 | index 81803be..e93da67 100644 |
100 | --- a/kmscube.c | 101 | --- a/kmscube.c |
101 | +++ b/kmscube.c | 102 | +++ b/kmscube.c |
102 | @@ -148,7 +148,11 @@ int main(int argc, char *argv[]) | 103 | @@ -166,7 +166,11 @@ int main(int argc, char *argv[]) |
103 | else if (mode == VIDEO) | 104 | else if (mode == VIDEO) |
104 | egl = init_cube_video(gbm, video, samples); | 105 | egl = init_cube_video(gbm, video, samples); |
105 | else | 106 | else |
@@ -112,5 +113,5 @@ index 3a2c4dd..276dc55 100644 | |||
112 | if (!egl) { | 113 | if (!egl) { |
113 | printf("failed to initialize EGL\n"); | 114 | printf("failed to initialize EGL\n"); |
114 | -- | 115 | -- |
115 | 2.7.4 | 116 | 2.22.0 |
116 | 117 | ||
diff --git a/meta/recipes-graphics/kmscube/kmscube_git.bb b/meta/recipes-graphics/kmscube/kmscube_git.bb index 513148f9e0..fd90d20172 100644 --- a/meta/recipes-graphics/kmscube/kmscube_git.bb +++ b/meta/recipes-graphics/kmscube/kmscube_git.bb | |||
@@ -6,8 +6,8 @@ DEPENDS = "virtual/libgles2 virtual/egl libdrm" | |||
6 | 6 | ||
7 | LIC_FILES_CHKSUM = "file://kmscube.c;beginline=1;endline=23;md5=8b309d4ee67b7315ff7381270dd631fb" | 7 | LIC_FILES_CHKSUM = "file://kmscube.c;beginline=1;endline=23;md5=8b309d4ee67b7315ff7381270dd631fb" |
8 | 8 | ||
9 | SRCREV = "485b385e966a63cecc143765d112d267b299ffe5" | 9 | SRCREV = "e888ea1d233b2639b87a68e099d18d4e919905df" |
10 | SRC_URI = "git://anongit.freedesktop.org/mesa/kmscube;branch=master;protocol=git \ | 10 | SRC_URI = "git://gitlab.freedesktop.org/mesa/kmscube;branch=master;protocol=https \ |
11 | file://detect-gst_bo_map-_unmap-and-use-it-or-avoid-it.patch" | 11 | file://detect-gst_bo_map-_unmap-and-use-it-or-avoid-it.patch" |
12 | UPSTREAM_CHECK_COMMITS = "1" | 12 | UPSTREAM_CHECK_COMMITS = "1" |
13 | 13 | ||