From fd58fb07cf4fcc0553d0608f5688fc03e41ea15c Mon Sep 17 00:00:00 2001 From: Tom Zanussi Date: Sat, 6 Apr 2013 16:47:32 -0500 Subject: mesa-demos: fix build errors When commit 6d17c9b ('emgd-driver-bin: add pkgconfig files') was added for libva, it exposed some missing EMGD functionality, which it turns out has been fixed by patches submitted or accepted upstream (see the individual patches for details). This adds those patches to get around the build problems when building with EMGD 1.16. Fixes [YOCTO #3469] for meta-intel (EMGD). Signed-off-by: Tom Zanussi --- .../mesa-demos/egl-mesa-screen-surface-query.patch | 35 ++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 common/recipes-graphics/mesa/mesa-demos/egl-mesa-screen-surface-query.patch (limited to 'common/recipes-graphics/mesa/mesa-demos/egl-mesa-screen-surface-query.patch') diff --git a/common/recipes-graphics/mesa/mesa-demos/egl-mesa-screen-surface-query.patch b/common/recipes-graphics/mesa/mesa-demos/egl-mesa-screen-surface-query.patch new file mode 100644 index 00000000..79537081 --- /dev/null +++ b/common/recipes-graphics/mesa/mesa-demos/egl-mesa-screen-surface-query.patch @@ -0,0 +1,35 @@ +From cf90a5c0c173d017a80cde057da57c365b3b1a40 Mon Sep 17 00:00:00 2001 +From: Frank Binns +Date: Fri, 29 Jun 2012 12:00:26 +0100 +Subject: [PATCH 2/2] mesa-demos: Query display for EGL_MESA_screen_surface + extension before using it + +This code makes heavy use of the EGL_MESA_screen_surface extension so +check the display to determine if it's supported by the underlying EGL +implementation. If it doesn't then bail. + +Signed-off-by: Frank Binns + +Applied and fixed up in Yocto by... + +Integrated-by: Tom Zanussi + +Upstream-Status: Pending + +Index: mesa-demos-8.0.1/src/egl/opengl/demo1.c +=================================================================== +--- mesa-demos-8.0.1.orig/src/egl/opengl/demo1.c ++++ mesa-demos-8.0.1/src/egl/opengl/demo1.c +@@ -110,6 +110,12 @@ main(int argc, char *argv[]) + printf("EGL version = %d.%d\n", maj, min); + printf("EGL_VENDOR = %s\n", eglQueryString(d, EGL_VENDOR)); + ++ if (!strstr(eglQueryString(d, EGL_EXTENSIONS), ++ "EGL_MESA_screen_surface")) { ++ printf("EGL_MESA_screen_surface is not supported\n"); ++ exit(1); ++ } ++ + eglGetConfigs(d, NULL, 0, &numConfigs); + configs = malloc(sizeof(*configs) *numConfigs); + eglGetConfigs(d, configs, numConfigs, &numConfigs); -- cgit v1.2.3-54-g00ecf