summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics
diff options
context:
space:
mode:
authorDaniel Díaz <daniel.diaz@linaro.org>2018-06-28 08:56:28 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-06-29 11:07:44 +0100
commit417a9b8baa0d6407a99dc815480f5b911e209f74 (patch)
treeded748a5d2c9bf5c2c185fc284aeab9bf41f6e38 /meta/recipes-graphics
parentd2d84b1f96dbf4ce4f47e31fb93a57cca9094213 (diff)
downloadpoky-417a9b8baa0d6407a99dc815480f5b911e209f74.tar.gz
kmscube: Update to master from 2018-06-17
Changes from 0d8de4ce: c2d4ba8 drm-legacy: fix poll for flip event, actually exit on user input 56c3917 formats: use weston's egl config matching logic, centralize format aac3788 Rework default modifier handling 4f7cec0 Use weak functions to handle lack of gbm modifiers 98f31bf cube-tex: make use of modifiers 063ce5c gbm: fix fallback for drivers that don't support modifiers 9dcce71 add MSAA Also refresh gbm_bo_map/_unmap patch. (From OE-Core rev: 4cc150f31f84d1cbc82df7d7f8fe045a06a9859e) Signed-off-by: Daniel Díaz <daniel.diaz@linaro.org> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics')
-rw-r--r--meta/recipes-graphics/kmscube/kmscube/detect-gst_bo_map-_unmap-and-use-it-or-avoid-it.patch10
-rw-r--r--meta/recipes-graphics/kmscube/kmscube_git.bb2
2 files changed, 6 insertions, 6 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 3605446e44..611e541598 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
@@ -49,9 +49,9 @@ diff --git a/configure.ac b/configure.ac
49index 8397f7b..c7f1f4d 100644 49index 8397f7b..c7f1f4d 100644
50--- a/configure.ac 50--- a/configure.ac
51+++ b/configure.ac 51+++ b/configure.ac
52@@ -65,5 +65,8 @@ if test "x$enable_gbm_modifiers" = xyes; then 52@@ -49,5 +49,8 @@ if test "x$HAVE_GST" = "xyes"; then
53 AC_DEFINE(HAVE_GBM_MODIFIERS, 1, [Define if you can use GBM properties.])
54 fi 53 fi
54 AM_CONDITIONAL(ENABLE_GST, [test "x$HAVE_GST" = "xyes"])
55 55
56+AC_CHECK_LIB([gbm], [gbm_bo_map], [HAVE_GBM_BO_MAP=yes], []) 56+AC_CHECK_LIB([gbm], [gbm_bo_map], [HAVE_GBM_BO_MAP=yes], [])
57+AM_CONDITIONAL(ENABLE_GBM_MAP, [test "x$HAVE_GBM_BO_MAP" = "xyes"]) 57+AM_CONDITIONAL(ENABLE_GBM_MAP, [test "x$HAVE_GBM_BO_MAP" = "xyes"])
@@ -99,12 +99,12 @@ diff --git a/kmscube.c b/kmscube.c
99index 3a2c4dd..276dc55 100644 99index 3a2c4dd..276dc55 100644
100--- a/kmscube.c 100--- a/kmscube.c
101+++ b/kmscube.c 101+++ b/kmscube.c
102@@ -142,7 +142,11 @@ int main(int argc, char *argv[]) 102@@ -148,7 +148,11 @@ int main(int argc, char *argv[])
103 else if (mode == VIDEO) 103 else if (mode == VIDEO)
104 egl = init_cube_video(gbm, video); 104 egl = init_cube_video(gbm, video, samples);
105 else 105 else
106+#if HAVE_GBM_BO_MAP 106+#if HAVE_GBM_BO_MAP
107 egl = init_cube_tex(gbm, mode); 107 egl = init_cube_tex(gbm, mode, samples);
108+#else 108+#else
109+ printf("gbm_bo_map() support missing\n"); 109+ printf("gbm_bo_map() support missing\n");
110+#endif 110+#endif
diff --git a/meta/recipes-graphics/kmscube/kmscube_git.bb b/meta/recipes-graphics/kmscube/kmscube_git.bb
index 5b64ed6438..46aeeb0179 100644
--- a/meta/recipes-graphics/kmscube/kmscube_git.bb
+++ b/meta/recipes-graphics/kmscube/kmscube_git.bb
@@ -6,7 +6,7 @@ DEPENDS = "virtual/libgles2 virtual/egl libdrm gstreamer1.0 gstreamer1.0-plugins
6 6
7LIC_FILES_CHKSUM = "file://kmscube.c;beginline=1;endline=23;md5=8b309d4ee67b7315ff7381270dd631fb" 7LIC_FILES_CHKSUM = "file://kmscube.c;beginline=1;endline=23;md5=8b309d4ee67b7315ff7381270dd631fb"
8 8
9SRCREV = "0d8de4ce3a03f36af1817f9b0586d132ad2c5d2e" 9SRCREV = "9dcce71e603616ee7a54707e932f962cdf8fb20a"
10SRC_URI = "git://anongit.freedesktop.org/mesa/kmscube;branch=master;protocol=git \ 10SRC_URI = "git://anongit.freedesktop.org/mesa/kmscube;branch=master;protocol=git \
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"
12UPSTREAM_CHECK_COMMITS = "1" 12UPSTREAM_CHECK_COMMITS = "1"