summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2013-08-26 00:53:17 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2013-11-20 17:53:59 +0100
commit9f9cc72ddd99c06b50380070bd8aca26c7bbd343 (patch)
treed4aede61c49ebaa1a1f7dc81fbd4893ab3099781
parentd127939d67117981b2b06e7ae23563e9f9af2ff9 (diff)
downloadopenembedded-core-contrib-9f9cc72ddd99c06b50380070bd8aca26c7bbd343.tar.gz
openembedded-core-contrib-9f9cc72ddd99c06b50380070bd8aca26c7bbd343.tar.bz2
openembedded-core-contrib-9f9cc72ddd99c06b50380070bd8aca26c7bbd343.zip
weston: Add PACKAGECONFIG for poppler
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r--meta/recipes-graphics/wayland/weston/0001-configure-Allow-to-disable-poppler.patch43
-rw-r--r--meta/recipes-graphics/wayland/weston_1.3.0.bb2
2 files changed, 45 insertions, 0 deletions
diff --git a/meta/recipes-graphics/wayland/weston/0001-configure-Allow-to-disable-poppler.patch b/meta/recipes-graphics/wayland/weston/0001-configure-Allow-to-disable-poppler.patch
new file mode 100644
index 0000000000..a8c1507dfc
--- /dev/null
+++ b/meta/recipes-graphics/wayland/weston/0001-configure-Allow-to-disable-poppler.patch
@@ -0,0 +1,43 @@
+From d409b069a97e0d76016d3bfd34d6fae96dcf5d9d Mon Sep 17 00:00:00 2001
+From: Martin Jansa <Martin.Jansa@gmail.com>
+Date: Mon, 26 Aug 2013 00:51:31 +0200
+Subject: [PATCH] configure: Allow to disable poppler
+
+Upstream-Status: Pending
+
+Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
+---
+ configure.ac | 9 ++++++++-
+ 1 file changed, 8 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index d5fea9d..53e0c0b 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -221,6 +221,11 @@ if test x$enable_simple_egl_clients = xyes -a x$enable_egl = xyes; then
+ [egl >= 7.10 glesv2 wayland-client wayland-egl wayland-cursor])
+ fi
+
++AC_ARG_ENABLE(poppler,
++ AS_HELP_STRING([--disable-poppler],
++ [disable poppler support]),,
++ enable_popper=yes)
++
+ AC_ARG_ENABLE(clients, [ --enable-clients],, enable_clients=yes)
+ AM_CONDITIONAL(BUILD_CLIENTS, test x$enable_clients = xyes)
+ if test x$enable_clients = xyes; then
+@@ -229,8 +234,10 @@ if test x$enable_clients = xyes; then
+ PKG_CHECK_MODULES(CLIENT, [wayland-client cairo >= 1.10.0 xkbcommon wayland-cursor])
+ PKG_CHECK_MODULES(WESTON_INFO, [wayland-client])
+
++ AS_IF([test "x$enable_poppler" != "no"], [
+ PKG_CHECK_MODULES(POPPLER, [poppler-glib glib-2.0 gobject-2.0 gio-2.0 ],
+- [have_poppler=yes], [have_poppler=no])
++ [have_poppler=yes], [have_poppler=no])],
++ [have_poppler=no])
+ PKG_CHECK_MODULES(CAIRO_EGL, [wayland-egl egl >= 7.10 cairo-egl >= 1.11.3 $cairo_modules],
+ [have_cairo_egl=yes], [have_cairo_egl=no])
+ AS_IF([test "x$have_cairo_egl" = "xyes"],
+--
+1.8.3.2
+
diff --git a/meta/recipes-graphics/wayland/weston_1.3.0.bb b/meta/recipes-graphics/wayland/weston_1.3.0.bb
index 7a0b3f9ac9..dd4667203d 100644
--- a/meta/recipes-graphics/wayland/weston_1.3.0.bb
+++ b/meta/recipes-graphics/wayland/weston_1.3.0.bb
@@ -6,6 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=275efac2559a224527bd4fd593d38466 \
file://src/compositor.c;endline=23;md5=aa98a8db03480fe7d500d0b1f4b8850c"
SRC_URI = "http://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \
+ file://0001-configure-Allow-to-disable-poppler.patch \
file://weston.png \
file://weston.desktop"
SRC_URI[md5sum] = "29ad994dd5ea07f52d7bffb24c25d9f7"
@@ -50,6 +51,7 @@ PACKAGECONFIG[fbdev] = "--enable-fbdev-compositor,--disable-fbdev-compositor,ude
PACKAGECONFIG[launch] = "--enable-weston-launch,--disable-weston-launch,libpam"
# VA-API desktop recorder
PACKAGECONFIG[vaapi] = "--enable-vaapi-recorder,--disable-vaapi-recorder,libva"
+PACKAGECONFIG[poppler] = "--enable-poppler,--disable-poppler,poppler"
do_install_append() {
# Weston doesn't need the .la files to load modules, so wipe them