summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/wayland/weston/make-libwebp-explicitly-configurable.patch
diff options
context:
space:
mode:
authorJussi Kukkonen <jussi.kukkonen@intel.com>2016-07-15 11:07:31 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-07-20 10:28:52 +0100
commita5392dd424f16d25513600bff13d635cf870265d (patch)
treeae8df1352dfae46a577080507f0433a8ed49992e /meta/recipes-graphics/wayland/weston/make-libwebp-explicitly-configurable.patch
parentddb0de65085f196ebf83c71d23b6ff4ac5f0bc76 (diff)
downloadpoky-a5392dd424f16d25513600bff13d635cf870265d.tar.gz
weston: Upgrade 1.10.0 -> 1.11.0
Remove now unnecessary patch, rebase others. Add musl build fix patch. (From OE-Core rev: f915e81336a63331bc6e4b920089d1495ae7f63f) Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/wayland/weston/make-libwebp-explicitly-configurable.patch')
-rw-r--r--meta/recipes-graphics/wayland/weston/make-libwebp-explicitly-configurable.patch37
1 files changed, 0 insertions, 37 deletions
diff --git a/meta/recipes-graphics/wayland/weston/make-libwebp-explicitly-configurable.patch b/meta/recipes-graphics/wayland/weston/make-libwebp-explicitly-configurable.patch
deleted file mode 100644
index ad07d4fc2d..0000000000
--- a/meta/recipes-graphics/wayland/weston/make-libwebp-explicitly-configurable.patch
+++ /dev/null
@@ -1,37 +0,0 @@
1
2The libwebp package is outside of openembedded-core, so make it
3explicitly configurable. Make it deterministic, so that if libwebp
4dependencies are missing, autoconf throws a fatal error.
5
6Upstream-Status: Pending
7
8Index: weston-1.5.0/configure.ac
9===================================================================
10--- weston-1.5.0.orig/configure.ac
11+++ weston-1.5.0/configure.ac
12@@ -268,9 +268,22 @@ fi
13
14 PKG_CHECK_MODULES(PIXMAN, [pixman-1])
15 PKG_CHECK_MODULES(PNG, [libpng])
16-PKG_CHECK_MODULES(WEBP, [libwebp], [have_webp=yes], [have_webp=no])
17-AS_IF([test "x$have_webp" = "xyes"],
18- [AC_DEFINE([HAVE_WEBP], [1], [Have webp])])
19+AC_ARG_ENABLE(webp,
20+ AS_HELP_STRING([--disable-webp],
21+ [Disable libwebp support]),,
22+ enable_webp=auto)
23+AM_CONDITIONAL(HAVE_WEBP, [test "x$enable_webp" = xyes])
24+AS_IF([test "x$enable_webp" != "xno"],
25+ PKG_CHECK_MODULES(WEBP,
26+ [libwebp],
27+ [have_webp=yes],
28+ [have_webp=no])
29+ AS_IF([test "x$have_webp" = "xno" -a "x$enable_webp" = "xyes"],
30+ AC_MSG_ERROR([libwebp support explicitly request, but lipwebp could not be found]))
31+ AS_IF([test "x$have_webp" = "xyes"],
32+ [enable_webp=yes]
33+ [AC_DEFINE([HAVE_WEBP], [1], [Have webp])])
34+)
35
36 AC_ARG_ENABLE(vaapi-recorder, [ --enable-vaapi-recorder],,
37 enable_vaapi_recorder=auto)