summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJussi Kukkonen <jussi.kukkonen@intel.com>2016-07-15 15:20:04 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-07-20 10:28:50 +0100
commit49d3d7da29a201b393196663d44f265f5a64ed8d (patch)
tree73b6c58cb65ddce2bfc5ed4a1a6c51bfc92b23f7
parentb1d573bdc880426c14d8a6802a17e513af21d1a8 (diff)
downloadpoky-49d3d7da29a201b393196663d44f265f5a64ed8d.tar.gz
libmatchbox: Upgrade 1.11 -> 1.12
libmatchbox now has a in-tree xsettings-client. * Use git SRC_URI like the other matchbox components. * Remove upstreamed patch. * Update license info (xsettings code is MIT). * Stop depending on libxsettings-client (From OE-Core rev: f28b0359c9e993233d5985e27152dc5cb4fbfd13) Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/libmatchbox/libmatchbox/libpng.patch69
-rw-r--r--meta/recipes-graphics/libmatchbox/libmatchbox_1.12.bb (renamed from meta/recipes-graphics/libmatchbox/libmatchbox_1.11.bb)16
2 files changed, 8 insertions, 77 deletions
diff --git a/meta/recipes-graphics/libmatchbox/libmatchbox/libpng.patch b/meta/recipes-graphics/libmatchbox/libmatchbox/libpng.patch
deleted file mode 100644
index 8cd507f799..0000000000
--- a/meta/recipes-graphics/libmatchbox/libmatchbox/libpng.patch
+++ /dev/null
@@ -1,69 +0,0 @@
1Upstream-Status: Backport
2Signed-off-by: Ross Burton <ross.burton@intel.com>
3
4From 19c3d242034748b3c60765683e1ff4e2df970205 Mon Sep 17 00:00:00 2001
5From: Ross Burton <ross.burton@intel.com>
6Date: Tue, 10 Dec 2013 11:37:32 +0000
7Subject: [PATCH] configure: improve libpng detection
8
9Instead of looking for "libpng12" explicitly though pkg-config and then falling
10back to library hunting, just use pkg-config to find "libpng" which is provided
11by both libpng12 and libpng16.
12
13This also makes the libpng detection deterministic.
14
15Signed-off-by: Ross Burton <ross.burton@intel.com>
16---
17 configure.ac | 29 +++++------------------------
18 1 file changed, 5 insertions(+), 24 deletions(-)
19
20diff --git a/configure.ac b/configure.ac
21index 8a28076..65d7c79 100644
22--- a/configure.ac
23+++ b/configure.ac
24@@ -34,7 +34,7 @@ AC_ARG_ENABLE(jpeg,
25 enable_jpeg=$enableval, enable_jpeg=no)
26
27 AC_ARG_ENABLE(png,
28- [ --disable-png disable png support [default=no]],
29+ [ --disable-png disable PNG support [default=enabled]],
30 enable_png=$enableval, enable_png=yes )
31
32 AC_ARG_ENABLE(doxygen-docs,
33@@ -156,29 +156,10 @@ fi
34 dnl ------ Check for PNG ---------------------------------------------------
35
36 if test x$enable_png != xno; then
37- AC_MSG_CHECKING(for libpng12)
38- if test x$PKG_CONFIG != xno && $PKG_CONFIG --exists libpng12; then
39- AC_MSG_RESULT(yes)
40- PNG_LIBS=`$PKG_CONFIG --libs libpng12`
41- PNG_CFLAGS=`$PKG_CONFIG --cflags libpng12`
42- AC_DEFINE(USE_PNG, [1], [Use Png])
43- SUPPORTS_PNG=1
44- PNG_REQUIRED="libpng12"
45- else
46- AC_MSG_RESULT(no)
47- # AC_CHECK_HEADERS(png.h, [ have_png_h="yes" ], [ have_png_h="no" ] )
48- AC_CHECK_LIB([png], [png_create_read_struct], [have_png="yes"], [have_png="no"])
49-
50- if test x$have_png=xyes && test x$have_png_h=xyes; then
51- AC_DEFINE(USE_PNG, [1], [Use Png])
52- SUPPORTS_PNG=1
53- PNG_LIBS="-lpng -lz"
54- MB_EXTRA_LIBS="$MB_EXTRA_LIBS $PNG_LIBS"
55- else
56- AC_MSG_WARN([*** Cannot find PNG, disabling support])
57- enable_png=no
58- fi
59- fi
60+ PKG_CHECK_MODULES(PNG, libpng)
61+ AC_DEFINE(USE_PNG, [1], [Use PNG])
62+ SUPPORTS_PNG=1
63+ PNG_REQUIRED="libpng"
64 fi
65
66
67--
681.8.5
69
diff --git a/meta/recipes-graphics/libmatchbox/libmatchbox_1.11.bb b/meta/recipes-graphics/libmatchbox/libmatchbox_1.12.bb
index f2eb675600..ce45e48147 100644
--- a/meta/recipes-graphics/libmatchbox/libmatchbox_1.11.bb
+++ b/meta/recipes-graphics/libmatchbox/libmatchbox_1.12.bb
@@ -3,26 +3,26 @@ SECTION = "x11/libs"
3HOMEPAGE = "http://matchbox-project.org/" 3HOMEPAGE = "http://matchbox-project.org/"
4BUGTRACKER = "http://bugzilla.yoctoproject.com/" 4BUGTRACKER = "http://bugzilla.yoctoproject.com/"
5 5
6LICENSE = "LGPLv2+" 6LICENSE = "LGPLv2+ & MIT"
7LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34 \ 7LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34 \
8 file://COPYING.MIT;md5=f45ed9332b4f50a35adf2065adde4ca7 \
8 file://libmb/mbexp.c;endline=20;md5=28c0aef3b23e308464f5dae6a11b0d2f \ 9 file://libmb/mbexp.c;endline=20;md5=28c0aef3b23e308464f5dae6a11b0d2f \
9 file://libmb/mbdotdesktop.c;endline=21;md5=5a287156b3207e851c1d68d09c439b51" 10 file://libmb/xsettings-client.c;endline=20;md5=4b106a387602db8d91a50d5cdfd65031"
10 11
11DEPENDS = "virtual/libx11 libxext" 12DEPENDS = "virtual/libx11 libxext"
12 13
13SRC_URI = "http://downloads.yoctoproject.org/releases/matchbox/${BPN}/${PV}/${BPN}-${PV}.tar.bz2 \ 14#SRCREV for 1.12
14 file://libpng.patch" 15SRCREV = "e846ee434f8e23d9db38af13c523f791495e0e87"
16SRC_URI = "git://git.yoctoproject.org/${BPN}"
15 17
16SRC_URI[md5sum] = "fc6cc807f55a3e7c752d8013176875d7" 18S = "${WORKDIR}/git"
17SRC_URI[sha256sum] = "254cab52e304a3512c8df4be59d690cf3921bbb68a28ede7fe26b93534217b53"
18 19
19inherit autotools pkgconfig distro_features_check 20inherit autotools pkgconfig distro_features_check
20# depends on virtual/libx11 21# depends on virtual/libx11
21REQUIRED_DISTRO_FEATURES = "x11" 22REQUIRED_DISTRO_FEATURES = "x11"
22 23
23PACKAGECONFIG ??= "jpeg png xft xsettings" 24PACKAGECONFIG ??= "jpeg png xft"
24PACKAGECONFIG[jpeg] = "--enable-jpeg,--disable-jpeg,jpeg" 25PACKAGECONFIG[jpeg] = "--enable-jpeg,--disable-jpeg,jpeg"
25PACKAGECONFIG[pango] = "--enable-pango,--disable-pango,pango" 26PACKAGECONFIG[pango] = "--enable-pango,--disable-pango,pango"
26PACKAGECONFIG[png] = "--enable-png,--disable-png,libpng" 27PACKAGECONFIG[png] = "--enable-png,--disable-png,libpng"
27PACKAGECONFIG[xft] = "--enable-xft,--disable-xft,libxft" 28PACKAGECONFIG[xft] = "--enable-xft,--disable-xft,libxft"
28PACKAGECONFIG[xsettings] = "--enable-xsettings,--disable-xsettings,libxsettings-client"