summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Orling <ticotimo@gmail.com>2014-07-04 13:06:16 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-07-10 17:38:32 +0100
commitd3a3f4bc2a3733dc0f4ab9539c6b0d6221721593 (patch)
tree2c725b47a4db4cdb9b71a5614ea9e64790d32ed5
parent4956ae7879cb206eebfa133994f4da453b616c57 (diff)
downloadpoky-d3a3f4bc2a3733dc0f4ab9539c6b0d6221721593.tar.gz
weston: make webp explicitly configurable
This patch fixes: weston/weston/latest lost dependency on libwebp weston/weston-examples/latest lost dependency on libwebp from: http://lists.openembedded.org/pipermail/openembedded-core/2014-June/093704.html (From OE-Core rev: f688ab0b8c3c1842d60cc2e18ac17af1f901f7b9) Signed-off-by: Tim Orling <TicoTimo@gmail.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/wayland/weston/make-libwebp-explicitly-configurable.patch37
-rw-r--r--meta/recipes-graphics/wayland/weston_1.5.0.bb6
2 files changed, 42 insertions, 1 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
new file mode 100644
index 0000000000..ad07d4fc2d
--- /dev/null
+++ b/meta/recipes-graphics/wayland/weston/make-libwebp-explicitly-configurable.patch
@@ -0,0 +1,37 @@
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)
diff --git a/meta/recipes-graphics/wayland/weston_1.5.0.bb b/meta/recipes-graphics/wayland/weston_1.5.0.bb
index 5573a06260..4a8584f79a 100644
--- a/meta/recipes-graphics/wayland/weston_1.5.0.bb
+++ b/meta/recipes-graphics/wayland/weston_1.5.0.bb
@@ -9,7 +9,9 @@ SRC_URI = "http://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \
9 file://weston.png \ 9 file://weston.png \
10 file://weston.desktop \ 10 file://weston.desktop \
11 file://disable-wayland-scanner-pkg-check.patch \ 11 file://disable-wayland-scanner-pkg-check.patch \
12 file://make-lcms-explicitly-configurable.patch" 12 file://make-lcms-explicitly-configurable.patch \
13 file://make-libwebp-explicitly-configurable.patch \
14"
13SRC_URI[md5sum] = "8eb40d230efc2411f083c20656534780" 15SRC_URI[md5sum] = "8eb40d230efc2411f083c20656534780"
14SRC_URI[sha256sum] = "06388ba04ac79aa72d685cc1a8e646ddb2b8cfe11fcc742294f9addac48b7684" 16SRC_URI[sha256sum] = "06388ba04ac79aa72d685cc1a8e646ddb2b8cfe11fcc742294f9addac48b7684"
15 17
@@ -56,6 +58,8 @@ PACKAGECONFIG[egl] = "--enable-egl --enable-simple-egl-clients,--disable-egl --d
56PACKAGECONFIG[cairo-glesv2] = "--with-cairo-glesv2,--with-cairo=image,cairo" 58PACKAGECONFIG[cairo-glesv2] = "--with-cairo-glesv2,--with-cairo=image,cairo"
57# Weston with lcms support 59# Weston with lcms support
58PACKAGECONFIG[lcms] = "--enable-lcms,--disable-lcms,lcms" 60PACKAGECONFIG[lcms] = "--enable-lcms,--disable-lcms,lcms"
61# Weston with webp support
62PACKAGECONFIG[webp] = "--enable-webp,--disable-webp,libwebp"
59 63
60do_install_append() { 64do_install_append() {
61 # Weston doesn't need the .la files to load modules, so wipe them 65 # Weston doesn't need the .la files to load modules, so wipe them