diff options
| author |   Tadao Tanikawa <tanikawa.tadao@jp.panasonic.com> | 2017-01-18 11:32:11 +0900 |
|---|---|---|
| committer | Tadao Tanikawa <tanikawa.tadao@jp.panasonic.com> | 2017-01-18 11:32:43 +0900 |
| commit | 793d8d01d0377dad21f4e1a330f00d822eced086 (patch) | |
| tree | 002df733dc532616ede3f90a6392ebc5ce0f316b /meta-rcar-gen2/recipes-graphics/wayland/weston/make-libwebp-explicitly-configurable.patch | |
| parent | d53759600dc1e97ce47ba7b0f7958b105012386a (diff) | |
| parent | 2420779506844c8b8cf2f50d8f08b622dc6468f6 (diff) | |
Merge branch 'chinook_fixed' into chinook
This merge is needed to support cluster combination of AGL
CES2017 Demo.
Change-Id: Iad92027680273ac0ad931a916fe2c3cafa91d600
Signed-off-by: Tadao Tanikawa <tanikawa.tadao@jp.panasonic.com>
Diffstat (limited to 'meta-rcar-gen2/recipes-graphics/wayland/weston/make-libwebp-explicitly-configurable.patch')
| -rw-r--r-- | meta-rcar-gen2/recipes-graphics/wayland/weston/make-libwebp-explicitly-configurable.patch | 37 |
1 files changed, 0 insertions, 37 deletions
diff --git a/meta-rcar-gen2/recipes-graphics/wayland/weston/make-libwebp-explicitly-configurable.patch b/meta-rcar-gen2/recipes-graphics/wayland/weston/make-libwebp-explicitly-configurable.patch deleted file mode 100644 index ad07d4f..0000000 --- a/meta-rcar-gen2/recipes-graphics/wayland/weston/make-libwebp-explicitly-configurable.patch +++ /dev/null @@ -1,37 +0,0 @@ - -The libwebp package is outside of openembedded-core, so make it -explicitly configurable. Make it deterministic, so that if libwebp -dependencies are missing, autoconf throws a fatal error. - -Upstream-Status: Pending - -Index: weston-1.5.0/configure.ac -=================================================================== ---- weston-1.5.0.orig/configure.ac -+++ weston-1.5.0/configure.ac -@@ -268,9 +268,22 @@ fi - - PKG_CHECK_MODULES(PIXMAN, [pixman-1]) - PKG_CHECK_MODULES(PNG, [libpng]) --PKG_CHECK_MODULES(WEBP, [libwebp], [have_webp=yes], [have_webp=no]) --AS_IF([test "x$have_webp" = "xyes"], -- [AC_DEFINE([HAVE_WEBP], [1], [Have webp])]) -+AC_ARG_ENABLE(webp, -+ AS_HELP_STRING([--disable-webp], -+ [Disable libwebp support]),, -+ enable_webp=auto) -+AM_CONDITIONAL(HAVE_WEBP, [test "x$enable_webp" = xyes]) -+AS_IF([test "x$enable_webp" != "xno"], -+ PKG_CHECK_MODULES(WEBP, -+ [libwebp], -+ [have_webp=yes], -+ [have_webp=no]) -+ AS_IF([test "x$have_webp" = "xno" -a "x$enable_webp" = "xyes"], -+ AC_MSG_ERROR([libwebp support explicitly request, but lipwebp could not be found])) -+ AS_IF([test "x$have_webp" = "xyes"], -+ [enable_webp=yes] -+ [AC_DEFINE([HAVE_WEBP], [1], [Have webp])]) -+) - - AC_ARG_ENABLE(vaapi-recorder, [ --enable-vaapi-recorder],, - enable_vaapi_recorder=auto) |