* [PATCH 01/13] glib-2.0: Upgrade 2.46.2 -> 2.48.1
2016-05-16 13:22 [PATCH 00/13] wayland V2 and misc upgrades Jussi Kukkonen
@ 2016-05-16 13:22 ` Jussi Kukkonen
2016-05-17 7:35 ` Richard Purdie
2016-05-16 13:22 ` [PATCH 02/13] glib-networking: Upgrade 2.46.1 -> 2.48.2 Jussi Kukkonen
` (11 subsequent siblings)
12 siblings, 1 reply; 20+ messages in thread
From: Jussi Kukkonen @ 2016-05-16 13:22 UTC (permalink / raw)
To: openembedded-core
* Remove now unnecessary readlink patches and
ignore-format-nonliteral-warning.patch
* Port relocate-modules.patch
* Add ${datadir}/gettext/its to FILES_${PN}-dev: this could be done in
gettext.bbclass but so far glib is the first and only ITS rule
installer
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
...c-Do-not-use-readlink-when-cross-compilin.patch | 31 ----------
.../glib-2.0/glib-2.0-configure-readlink.patch | 29 ----------
.../ignore-format-nonliteral-warning.patch | 39 -------------
.../glib-2.0/glib-2.0/relocate-modules.patch | 66 +++++++++++-----------
.../{glib-2.0_2.46.2.bb => glib-2.0_2.48.1.bb} | 7 +--
meta/recipes-core/glib-2.0/glib.inc | 3 +-
6 files changed, 36 insertions(+), 139 deletions(-)
delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0/0001-configure.ac-Do-not-use-readlink-when-cross-compilin.patch
delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0/glib-2.0-configure-readlink.patch
delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0/ignore-format-nonliteral-warning.patch
rename meta/recipes-core/glib-2.0/{glib-2.0_2.46.2.bb => glib-2.0_2.48.1.bb} (73%)
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0001-configure.ac-Do-not-use-readlink-when-cross-compilin.patch b/meta/recipes-core/glib-2.0/glib-2.0/0001-configure.ac-Do-not-use-readlink-when-cross-compilin.patch
deleted file mode 100644
index 0be3631..0000000
--- a/meta/recipes-core/glib-2.0/glib-2.0/0001-configure.ac-Do-not-use-readlink-when-cross-compilin.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-commit 9b38d507ec37b3d7d4df6095fa7ed16b47d399f7
-Author: Drew Moseley <drew_moseley@mentor.com>
-Date: Sat Mar 29 21:10:43 2014 -0400
-
- configure.ac: Do not use readlink when cross compiling.
-
- Do not use readlink to set ABS_GLIB_RUNTIME_LIBDIR when cross
- compiling. Doing so causes host paths to potentially pollute
- the target.
-
- Note that in this case the path is not converted to absolute if
- it contains any ".." references so it's not completely correct.
-
- Upstream-Status: Submitted [https://bugzilla.gnome.org/show_bug.cgi?id=727575]
- Signed-off-by: Drew Moseley <drew_moseley@mentor.com>
-
-diff -rub glib-2.38.2.orig/configure.ac glib-2.38.2/configure.ac
---- glib-2.38.2.orig/configure.ac 2014-04-03 20:17:13.035567143 -0400
-+++ glib-2.38.2/configure.ac 2014-04-03 20:19:07.071566057 -0400
-@@ -275,7 +275,11 @@
- [],
- [with_runtime_libdir=""])
- GLIB_RUNTIME_LIBDIR="$with_runtime_libdir"
-+AS_IF([ test $cross_compiling = yes ], [
-+ABS_GLIB_RUNTIME_LIBDIR="$libdir/$with_runtime_libdir"
-+], [
- ABS_GLIB_RUNTIME_LIBDIR="`readlink -m $libdir/$with_runtime_libdir`"
-+])
- AC_SUBST(GLIB_RUNTIME_LIBDIR)
- AC_SUBST(ABS_GLIB_RUNTIME_LIBDIR)
- AM_CONDITIONAL(HAVE_GLIB_RUNTIME_LIBDIR, [test "x$with_runtime_libdir" != "x"])
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/glib-2.0-configure-readlink.patch b/meta/recipes-core/glib-2.0/glib-2.0/glib-2.0-configure-readlink.patch
deleted file mode 100644
index 9759d11..0000000
--- a/meta/recipes-core/glib-2.0/glib-2.0/glib-2.0-configure-readlink.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-configure.ac: change readlink -f to -m
-
-Change "readlink -f" to "readlink -m" since $libdir/$with_runtime_libdir
-may not exist.
-
-This patch should go to the upstream, I will send it sooner.
-
-Upstream-Status: Pending
-
-Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
---- a/configure.ac
-+++ b/configure.ac
-@@ -271,7 +271,7 @@ AC_ARG_WITH(runtime-libdir,
- [],
- [with_runtime_libdir=""])
- GLIB_RUNTIME_LIBDIR="$with_runtime_libdir"
--ABS_GLIB_RUNTIME_LIBDIR="`readlink -f $libdir/$with_runtime_libdir`"
-+ABS_GLIB_RUNTIME_LIBDIR="`readlink -m $libdir/$with_runtime_libdir`"
- AC_SUBST(GLIB_RUNTIME_LIBDIR)
- AC_SUBST(ABS_GLIB_RUNTIME_LIBDIR)
- AM_CONDITIONAL(HAVE_GLIB_RUNTIME_LIBDIR, [test "x$with_runtime_libdir" != "x"])
---
-1.8.1.2
-
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/ignore-format-nonliteral-warning.patch b/meta/recipes-core/glib-2.0/glib-2.0/ignore-format-nonliteral-warning.patch
deleted file mode 100644
index d533975..0000000
--- a/meta/recipes-core/glib-2.0/glib-2.0/ignore-format-nonliteral-warning.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 8cdbc7fb2c8c876902e457abe46ee18a0b134486 Mon Sep 17 00:00:00 2001
-From: coypu <coypu@sdf.org>
-Date: Wed, 2 Mar 2016 19:38:48 +0200
-Subject: gdate: Move warning pragma outside of function
-
-Commit 0817af40e8c74c721c30f6ef482b1f53d12044c7 breaks the build on
-older versions of GCC, which don't allow pragma inside functions.
-
-https://bugzilla.gnome.org/761550
----
-Upstream-Status: Backport
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-
- glib/gdate.c | 8 +++++---
- 1 file changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/glib/gdate.c b/glib/gdate.c
-index cdc735c..92c34d2 100644
---- a/glib/gdate.c
-+++ b/glib/gdate.c
-@@ -2439,6 +2439,9 @@ win32_strftime_helper (const GDate *d,
- *
- * Returns: number of characters written to the buffer, or 0 the buffer was too small
- */
-+#pragma GCC diagnostic push
-+#pragma GCC diagnostic ignored "-Wformat-nonliteral"
-+
- gsize
- g_date_strftime (gchar *s,
- gsize slen,
-@@ -2552,3 +2552,5 @@ g_date_strftime (gchar *s,
- return retval;
- #endif
- }
-+
-+#pragma GCC diagnostic pop
---
-cgit v0.12
-
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch b/meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch
index f9e3f3d..65d5b43 100644
--- a/meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch
+++ b/meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch
@@ -6,44 +6,42 @@ This solves relocation problems with GIOModule for native builds of glib.
Upstream-Status: Inappropriate
Signed-off-by: Ross Burton <ross.burton@intel.com>
+Port patch to 2.48
+Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
+---
+ gio/giomodule.c | 12 +++++++++++-
+ 1 file changed, 11 insertions(+), 1 deletion(-)
+
diff --git a/gio/giomodule.c b/gio/giomodule.c
-index 56c498c..a2e32b7 100644
+index da7c167..cc0bc7c 100644
--- a/gio/giomodule.c
+++ b/gio/giomodule.c
-@@ -47,6 +47,27 @@
- #include "gdesktopappinfo.h"
+@@ -40,6 +40,8 @@
+ #include "gnetworkmonitor.h"
+ #ifdef G_OS_WIN32
+ #include "gregistrysettingsbackend.h"
++#else
++#include <dlfcn.h>
#endif
+ #include <glib/gstdio.h>
-+#include <dlfcn.h>
-+
-+/*
-+ * Generate a GIO module directory based on where glib is installed
-+ */
-+static const char *
-+_get_gio_module_dir (void)
-+{
-+ Dl_info info;
-+
-+ if (dladdr (g_io_module_new, &info)) {
-+ char *libdir = g_path_get_dirname (info.dli_fname);
-+ char *dir = g_build_filename (libdir, "gio", "modules", NULL);
-+ g_free (libdir);
-+ return dir;
-+ } else {
-+ return GIO_MODULE_DIR;
-+ }
-+}
-+
+@@ -1036,7 +1038,15 @@ get_gio_module_dir (void)
+ #endif
+ g_free (install_dir);
+ #else
+- module_dir = g_strdup (GIO_MODULE_DIR);
++ Dl_info info;
+
- /**
- * SECTION:giomodule
- * @short_description: Loadable GIO Modules
-@@ -1057,7 +1078,7 @@ _g_io_modules_ensure_loaded (void)
- /* Then load the compiled in path */
- module_dir = g_getenv ("GIO_MODULE_DIR");
- if (module_dir == NULL)
-- module_dir = GIO_MODULE_DIR;
-+ module_dir = _get_gio_module_dir ();
-
- g_io_modules_scan_all_in_directory_with_scope (module_dir, scope);
++ if (dladdr (g_io_module_new, &info)) {
++ char *libdir = g_path_get_dirname (info.dli_fname);
++ module_dir = g_build_filename (libdir, "gio", "modules", NULL);
++ g_free (libdir);
++ } else {
++ module_dir = g_strdup (GIO_MODULE_DIR);
++ }
+ #endif
+ }
+--
+2.1.4
+
diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.46.2.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.48.1.bb
similarity index 73%
rename from meta/recipes-core/glib-2.0/glib-2.0_2.46.2.bb
rename to meta/recipes-core/glib-2.0/glib-2.0_2.48.1.bb
index 9e95149..ef96ca1 100644
--- a/meta/recipes-core/glib-2.0/glib-2.0_2.46.2.bb
+++ b/meta/recipes-core/glib-2.0/glib-2.0_2.48.1.bb
@@ -7,17 +7,14 @@ SHRT_VER = "${@oe.utils.trim_version("${PV}", 2)}"
SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \
file://configure-libtool.patch \
file://fix-conflicting-rand.patch \
- file://glib-2.0-configure-readlink.patch \
file://run-ptest \
file://ptest-paths.patch \
file://uclibc_musl_translation.patch \
- file://0001-configure.ac-Do-not-use-readlink-when-cross-compilin.patch \
file://allow-run-media-sdX-drive-mount-if-username-root.patch \
file://0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch \
file://Enable-more-tests-while-cross-compiling.patch \
file://gi-exclude.patch \
file://0001-Install-gio-querymodules-as-libexec_PROGRAM.patch \
- file://ignore-format-nonliteral-warning.patch \
file://0001-Do-not-ignore-return-value-of-write.patch \
file://0002-tests-Ignore-y2k-warnings.patch \
"
@@ -25,5 +22,5 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \
SRC_URI_append_class-native = " file://glib-gettextize-dir.patch \
file://relocate-modules.patch"
-SRC_URI[md5sum] = "7f815d6e46df68e070cb421ed7f1139e"
-SRC_URI[sha256sum] = "5031722e37036719c1a09163cc6cf7c326e4c4f1f1e074b433c156862bd733db"
+SRC_URI[md5sum] = "67bd3b75c9f6d5587b457dc01cdcd5bb"
+SRC_URI[sha256sum] = "74411bff489cb2a3527bac743a51018841a56a4d896cc1e0d0d54f8166a14612"
diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc
index e764fad..ddf5e40 100644
--- a/meta/recipes-core/glib-2.0/glib.inc
+++ b/meta/recipes-core/glib-2.0/glib.inc
@@ -59,7 +59,8 @@ FILES_${PN}-dev += "${libdir}/glib-2.0/include \
${bindir}/glib-mkenums \
${bindir}/glib-compile-resources \
${datadir}/glib-2.0/gettext/po/Makefile.in.in \
- ${datadir}/glib-2.0/schemas/gschema.dtd"
+ ${datadir}/glib-2.0/schemas/gschema.dtd \
+ ${datadir}/gettext/its"
FILES_${PN}-dbg += "${datadir}/glib-2.0/gdb ${datadir}/gdb"
FILES_${PN}-codegen = "${datadir}/glib-2.0/codegen/*.py \
${bindir}/gdbus-codegen"
--
2.1.4
^ permalink raw reply related [flat|nested] 20+ messages in thread* Re: [PATCH 01/13] glib-2.0: Upgrade 2.46.2 -> 2.48.1
2016-05-16 13:22 ` [PATCH 01/13] glib-2.0: Upgrade 2.46.2 -> 2.48.1 Jussi Kukkonen
@ 2016-05-17 7:35 ` Richard Purdie
2016-05-17 10:35 ` Jussi Kukkonen
2016-05-17 12:17 ` [PATCH 0/2] Fix GLib 2.48.1 upgrade breakage Jussi Kukkonen
0 siblings, 2 replies; 20+ messages in thread
From: Richard Purdie @ 2016-05-17 7:35 UTC (permalink / raw)
To: Jussi Kukkonen, openembedded-core
On Mon, 2016-05-16 at 16:22 +0300, Jussi Kukkonen wrote:
> * Remove now unnecessary readlink patches and
> ignore-format-nonliteral-warning.patch
> * Port relocate-modules.patch
> * Add ${datadir}/gettext/its to FILES_${PN}-dev: this could be done
> in
> gettext.bbclass but so far glib is the first and only ITS rule
> installer
I think, but I'm not 100% sure that this caused:
https://autobuilder.yoctoproject.org/main/builders/build-appliance/buil
ds/762/steps/BuildImages_1/logs/stdio
which failed in this way in many different builds.
Cheers,
Richard
^ permalink raw reply [flat|nested] 20+ messages in thread* Re: [PATCH 01/13] glib-2.0: Upgrade 2.46.2 -> 2.48.1
2016-05-17 7:35 ` Richard Purdie
@ 2016-05-17 10:35 ` Jussi Kukkonen
2016-05-17 12:17 ` [PATCH 0/2] Fix GLib 2.48.1 upgrade breakage Jussi Kukkonen
1 sibling, 0 replies; 20+ messages in thread
From: Jussi Kukkonen @ 2016-05-17 10:35 UTC (permalink / raw)
To: Richard Purdie; +Cc: Patches and discussions about the oe-core layer
On 17 May 2016 at 10:35, Richard Purdie
<richard.purdie@linuxfoundation.org> wrote:
> On Mon, 2016-05-16 at 16:22 +0300, Jussi Kukkonen wrote:
>> * Remove now unnecessary readlink patches and
>> ignore-format-nonliteral-warning.patch
>> * Port relocate-modules.patch
>> * Add ${datadir}/gettext/its to FILES_${PN}-dev: this could be done
>> in
>> gettext.bbclass but so far glib is the first and only ITS rule
>> installer
>
> I think, but I'm not 100% sure that this caused:
>
> https://autobuilder.yoctoproject.org/main/builders/build-appliance/buil
> ds/762/steps/BuildImages_1/logs/stdio
>
> which failed in this way in many different builds.
You are correct. These projects have their own copy of glib-gettext.m4
which changed in glib proper and m4_copy() now fails if this happens.
Amusingly the only change was that AM_GLIB_GNU_GETTEXT was marked
deprecated...
I'll do a world build to check if there are any other failures and
then send patches.
Thanks,
Jussi
> Cheers,
>
> Richard
^ permalink raw reply [flat|nested] 20+ messages in thread* [PATCH 0/2] Fix GLib 2.48.1 upgrade breakage
2016-05-17 7:35 ` Richard Purdie
2016-05-17 10:35 ` Jussi Kukkonen
@ 2016-05-17 12:17 ` Jussi Kukkonen
2016-05-17 12:18 ` [PATCH 1/2] gnome-doc-utils: Update AM_GLIB_GNU_GETTEXT macro Jussi Kukkonen
2016-05-17 12:18 ` [PATCH 2/2] pkgconfig: " Jussi Kukkonen
1 sibling, 2 replies; 20+ messages in thread
From: Jussi Kukkonen @ 2016-05-17 12:17 UTC (permalink / raw)
To: openembedded-core
Two patches to fix configure failures that resulted from the glib-2.0
2.48.1 update. In both cases the AM_GLIB_GNU_GETTEXT macro is updated to
match the one provided by glib (the change is that the macro is now
marked deprecated).
I've pushed these on top of the original branch since these patches
should only be used with new GLib.
- Jussi
The following changes since commit cb405da51da0413d5ac5999330a4e49cb7be262f:
weston: Upgrade 1.9.0 -> 1.10.0 (2016-05-16 14:20:26 +0300)
are available in the git repository at:
git://git.yoctoproject.org/poky-contrib jku/upgrades
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=jku/upgrades
Jussi Kukkonen (2):
gnome-doc-utils: Update AM_GLIB_GNU_GETTEXT macro
pkgconfig: Update AM_GLIB_GNU_GETTEXT macro
...t.m4-Update-AM_GLIB_GNU_GETTEXT-to-match-.patch | 41 ++++++++++++++++++++++
meta/recipes-devtools/pkgconfig/pkgconfig_git.bb | 1 +
...t.m4-Update-AM_GLIB_GNU_GETTEXT-to-match-.patch | 40 +++++++++++++++++++++
.../recipes-gnome/gnome/gnome-doc-utils_0.20.10.bb | 1 +
4 files changed, 83 insertions(+)
create mode 100644 meta/recipes-devtools/pkgconfig/pkgconfig/0001-glib-gettext.m4-Update-AM_GLIB_GNU_GETTEXT-to-match-.patch
create mode 100644 meta/recipes-gnome/gnome/gnome-doc-utils/0001-glib-gettext.m4-Update-AM_GLIB_GNU_GETTEXT-to-match-.patch
--
2.1.4
^ permalink raw reply [flat|nested] 20+ messages in thread
* [PATCH 1/2] gnome-doc-utils: Update AM_GLIB_GNU_GETTEXT macro
2016-05-17 12:17 ` [PATCH 0/2] Fix GLib 2.48.1 upgrade breakage Jussi Kukkonen
@ 2016-05-17 12:18 ` Jussi Kukkonen
2016-05-17 12:18 ` [PATCH 2/2] pkgconfig: " Jussi Kukkonen
1 sibling, 0 replies; 20+ messages in thread
From: Jussi Kukkonen @ 2016-05-17 12:18 UTC (permalink / raw)
To: openembedded-core
This fixes
error: m4_copy: won't overwrite defined macro: glib_DEFUN
with glib-2.0 >= 2.48.
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
...t.m4-Update-AM_GLIB_GNU_GETTEXT-to-match-.patch | 40 ++++++++++++++++++++++
.../recipes-gnome/gnome/gnome-doc-utils_0.20.10.bb | 1 +
2 files changed, 41 insertions(+)
create mode 100644 meta/recipes-gnome/gnome/gnome-doc-utils/0001-glib-gettext.m4-Update-AM_GLIB_GNU_GETTEXT-to-match-.patch
diff --git a/meta/recipes-gnome/gnome/gnome-doc-utils/0001-glib-gettext.m4-Update-AM_GLIB_GNU_GETTEXT-to-match-.patch b/meta/recipes-gnome/gnome/gnome-doc-utils/0001-glib-gettext.m4-Update-AM_GLIB_GNU_GETTEXT-to-match-.patch
new file mode 100644
index 0000000..4cfcabd
--- /dev/null
+++ b/meta/recipes-gnome/gnome/gnome-doc-utils/0001-glib-gettext.m4-Update-AM_GLIB_GNU_GETTEXT-to-match-.patch
@@ -0,0 +1,40 @@
+From 426e38468463a4abb495cf6a269b9635b2107519 Mon Sep 17 00:00:00 2001
+From: Jussi Kukkonen <jussi.kukkonen@intel.com>
+Date: Tue, 17 May 2016 13:51:24 +0300
+Subject: [PATCH] glib-gettext.m4: Update AM_GLIB_GNU_GETTEXT to match glib
+
+This avoids
+ error: m4_copy: won't overwrite defined macro: glib_DEFUN
+
+Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
+Upstream-Status: Inappropriate [No upstream]
+---
+ m4/glib-gettext.m4 | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/m4/glib-gettext.m4 b/m4/glib-gettext.m4
+index 81f8fd2..e2b142b 100644
+--- a/m4/glib-gettext.m4
++++ b/m4/glib-gettext.m4
+@@ -310,7 +310,7 @@ msgstr ""
+ # on various variables needed by the Makefile.in.in installed by
+ # glib-gettextize.
+ dnl
+-glib_DEFUN([GLIB_GNU_GETTEXT],
++AU_DEFUN([GLIB_GNU_GETTEXT],
+ [AC_REQUIRE([AC_PROG_CC])dnl
+ AC_REQUIRE([AC_HEADER_STDC])dnl
+
+@@ -381,7 +381,8 @@ glib_DEFUN([GLIB_GNU_GETTEXT],
+ rm -f po/POTFILES
+ sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
+ < $srcdir/po/POTFILES.in > po/POTFILES
+- ])
++ ]
++ [[$0: This macro is deprecated. You should use upstream gettext instead.]])
+
+ # AX_GLIB_DEFINE_LOCALEDIR(VARIABLE)
+ # -------------------------------
+--
+2.1.4
+
diff --git a/meta/recipes-gnome/gnome/gnome-doc-utils_0.20.10.bb b/meta/recipes-gnome/gnome/gnome-doc-utils_0.20.10.bb
index 78cc005..ed01ea7 100644
--- a/meta/recipes-gnome/gnome/gnome-doc-utils_0.20.10.bb
+++ b/meta/recipes-gnome/gnome/gnome-doc-utils_0.20.10.bb
@@ -5,6 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING.GPL;md5=eb723b61539feef013de476e68b5c50a \
SRC_URI += "file://xsltproc_nonet.patch \
file://use-usr-bin-env-for-python-in-xml2po.patch \
file://sysrooted-pkg-config.patch \
+ file://0001-glib-gettext.m4-Update-AM_GLIB_GNU_GETTEXT-to-match-.patch \
"
SRC_URI[archive.md5sum] = "3c64ad7bacd617b04999e4a168afaac5"
--
2.1.4
^ permalink raw reply related [flat|nested] 20+ messages in thread* [PATCH 2/2] pkgconfig: Update AM_GLIB_GNU_GETTEXT macro
2016-05-17 12:17 ` [PATCH 0/2] Fix GLib 2.48.1 upgrade breakage Jussi Kukkonen
2016-05-17 12:18 ` [PATCH 1/2] gnome-doc-utils: Update AM_GLIB_GNU_GETTEXT macro Jussi Kukkonen
@ 2016-05-17 12:18 ` Jussi Kukkonen
1 sibling, 0 replies; 20+ messages in thread
From: Jussi Kukkonen @ 2016-05-17 12:18 UTC (permalink / raw)
To: openembedded-core
This fixes
error: m4_copy: won't overwrite defined macro: glib_DEFUN
with glib-2.0 >= 2.48.
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
...t.m4-Update-AM_GLIB_GNU_GETTEXT-to-match-.patch | 41 ++++++++++++++++++++++
meta/recipes-devtools/pkgconfig/pkgconfig_git.bb | 1 +
2 files changed, 42 insertions(+)
create mode 100644 meta/recipes-devtools/pkgconfig/pkgconfig/0001-glib-gettext.m4-Update-AM_GLIB_GNU_GETTEXT-to-match-.patch
diff --git a/meta/recipes-devtools/pkgconfig/pkgconfig/0001-glib-gettext.m4-Update-AM_GLIB_GNU_GETTEXT-to-match-.patch b/meta/recipes-devtools/pkgconfig/pkgconfig/0001-glib-gettext.m4-Update-AM_GLIB_GNU_GETTEXT-to-match-.patch
new file mode 100644
index 0000000..80310cd
--- /dev/null
+++ b/meta/recipes-devtools/pkgconfig/pkgconfig/0001-glib-gettext.m4-Update-AM_GLIB_GNU_GETTEXT-to-match-.patch
@@ -0,0 +1,41 @@
+From e404e27de77d8b993c4cc87013d707200b3a5547 Mon Sep 17 00:00:00 2001
+From: Jussi Kukkonen <jussi.kukkonen@intel.com>
+Date: Tue, 17 May 2016 13:26:27 +0300
+Subject: [PATCH] glib-gettext.m4: Update AM_GLIB_GNU_GETTEXT to match glib
+
+This avoids
+ error: m4_copy: won't overwrite defined macro: glib_DEFUN
+
+Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
+Upstream-Status: Pending
+
+---
+ glib/m4macros/glib-gettext.m4 | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/glib/m4macros/glib-gettext.m4 b/glib/m4macros/glib-gettext.m4
+index 5217fd8..155b1d8 100644
+--- a/glib/m4macros/glib-gettext.m4
++++ b/glib/m4macros/glib-gettext.m4
+@@ -313,7 +313,7 @@ msgstr ""
+ # on various variables needed by the Makefile.in.in installed by
+ # glib-gettextize.
+ dnl
+-glib_DEFUN([GLIB_GNU_GETTEXT],
++AU_DEFUN([GLIB_GNU_GETTEXT],
+ [AC_REQUIRE([AC_PROG_CC])dnl
+
+ GLIB_LC_MESSAGES
+@@ -383,7 +383,8 @@ glib_DEFUN([GLIB_GNU_GETTEXT],
+ rm -f po/POTFILES
+ sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
+ < $srcdir/po/POTFILES.in > po/POTFILES
+- ])
++ ],
++ [[$0: This macro is deprecated. You should use upstream gettext instead.]])
+
+ # AM_GLIB_DEFINE_LOCALEDIR(VARIABLE)
+ # -------------------------------
+--
+2.1.4
+
diff --git a/meta/recipes-devtools/pkgconfig/pkgconfig_git.bb b/meta/recipes-devtools/pkgconfig/pkgconfig_git.bb
index 86503b5..ff8254c 100644
--- a/meta/recipes-devtools/pkgconfig/pkgconfig_git.bb
+++ b/meta/recipes-devtools/pkgconfig/pkgconfig_git.bb
@@ -19,6 +19,7 @@ SRC_URI = "git://anongit.freedesktop.org/pkg-config \
file://pkg-config-native.in \
file://fix-glib-configure-libtool-usage.patch \
file://0001-gdate-Move-warning-pragma-outside-of-function.patch \
+ file://0001-glib-gettext.m4-Update-AM_GLIB_GNU_GETTEXT-to-match-.patch \
"
S = "${WORKDIR}/git"
--
2.1.4
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH 02/13] glib-networking: Upgrade 2.46.1 -> 2.48.2
2016-05-16 13:22 [PATCH 00/13] wayland V2 and misc upgrades Jussi Kukkonen
2016-05-16 13:22 ` [PATCH 01/13] glib-2.0: Upgrade 2.46.2 -> 2.48.1 Jussi Kukkonen
@ 2016-05-16 13:22 ` Jussi Kukkonen
2016-05-16 13:22 ` [PATCH 03/13] pango: Upgrade 1.38.1 -> 1.40.1 Jussi Kukkonen
` (10 subsequent siblings)
12 siblings, 0 replies; 20+ messages in thread
From: Jussi Kukkonen @ 2016-05-16 13:22 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
.../{glib-networking_2.46.1.bb => glib-networking_2.48.2.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-core/glib-networking/{glib-networking_2.46.1.bb => glib-networking_2.48.2.bb} (88%)
diff --git a/meta/recipes-core/glib-networking/glib-networking_2.46.1.bb b/meta/recipes-core/glib-networking/glib-networking_2.48.2.bb
similarity index 88%
rename from meta/recipes-core/glib-networking/glib-networking_2.46.1.bb
rename to meta/recipes-core/glib-networking/glib-networking_2.48.2.bb
index 749ac98..50d9983 100644
--- a/meta/recipes-core/glib-networking/glib-networking_2.46.1.bb
+++ b/meta/recipes-core/glib-networking/glib-networking_2.48.2.bb
@@ -9,8 +9,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2"
SECTION = "libs"
DEPENDS = "glib-2.0 intltool-native"
-SRC_URI[archive.md5sum] = "c000e0b579f5d8fd48efebc7ac4d95dc"
-SRC_URI[archive.sha256sum] = "d5034214217f705891b6c9e719cc2c583c870bfcfdc454ebbb5e5e8940ac90b1"
+SRC_URI[archive.md5sum] = "d7cf81d52c856b0c66f7821021f40e08"
+SRC_URI[archive.sha256sum] = "925c0c49d6b2b8b5695f2e33cd952d1dbb7d18d3f2f796413577719315bb3a84"
PACKAGECONFIG ??= "ca-certificates gnutls"
--
2.1.4
^ permalink raw reply related [flat|nested] 20+ messages in thread* [PATCH 03/13] pango: Upgrade 1.38.1 -> 1.40.1
2016-05-16 13:22 [PATCH 00/13] wayland V2 and misc upgrades Jussi Kukkonen
2016-05-16 13:22 ` [PATCH 01/13] glib-2.0: Upgrade 2.46.2 -> 2.48.1 Jussi Kukkonen
2016-05-16 13:22 ` [PATCH 02/13] glib-networking: Upgrade 2.46.1 -> 2.48.2 Jussi Kukkonen
@ 2016-05-16 13:22 ` Jussi Kukkonen
2016-05-16 13:22 ` [PATCH 04/13] gdk-pixbuf: Upgrade 2.32.3 -> 2.34.0 Jussi Kukkonen
` (9 subsequent siblings)
12 siblings, 0 replies; 20+ messages in thread
From: Jussi Kukkonen @ 2016-05-16 13:22 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
meta/recipes-graphics/pango/{pango_1.38.1.bb => pango_1.40.1.bb} | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
rename meta/recipes-graphics/pango/{pango_1.38.1.bb => pango_1.40.1.bb} (92%)
diff --git a/meta/recipes-graphics/pango/pango_1.38.1.bb b/meta/recipes-graphics/pango/pango_1.40.1.bb
similarity index 92%
rename from meta/recipes-graphics/pango/pango_1.38.1.bb
rename to meta/recipes-graphics/pango/pango_1.40.1.bb
index 756dac4..6e1e6c9 100644
--- a/meta/recipes-graphics/pango/pango_1.38.1.bb
+++ b/meta/recipes-graphics/pango/pango_1.40.1.bb
@@ -16,9 +16,8 @@ inherit gnomebase gtk-doc ptest-gnome upstream-version-is-even gobject-introspec
SRC_URI += "file://run-ptest \
file://0001-Drop-introspection-macros-from-acinclude.m4.patch \
"
-
-SRC_URI[archive.md5sum] = "7fde35d4a127b55ce8bbcefe109bc80d"
-SRC_URI[archive.sha256sum] = "1320569f6c6d75d6b66172b2d28e59c56ee864ee9df202b76799c4506a214eb7"
+SRC_URI[archive.md5sum] = "6fc88c6529890d6c8e03074d57a3eceb"
+SRC_URI[archive.sha256sum] = "e27af54172c72b3ac6be53c9a4c67053e16c905e02addcf3a603ceb2005c1a40"
DEPENDS = "glib-2.0 glib-2.0-native fontconfig freetype virtual/libiconv cairo harfbuzz"
--
2.1.4
^ permalink raw reply related [flat|nested] 20+ messages in thread* [PATCH 04/13] gdk-pixbuf: Upgrade 2.32.3 -> 2.34.0
2016-05-16 13:22 [PATCH 00/13] wayland V2 and misc upgrades Jussi Kukkonen
` (2 preceding siblings ...)
2016-05-16 13:22 ` [PATCH 03/13] pango: Upgrade 1.38.1 -> 1.40.1 Jussi Kukkonen
@ 2016-05-16 13:22 ` Jussi Kukkonen
2016-05-16 13:22 ` [PATCH 05/13] gsettings-desktop-schemas: Upgrade 3.19.3 -> 3.20.0 Jussi Kukkonen
` (8 subsequent siblings)
12 siblings, 0 replies; 20+ messages in thread
From: Jussi Kukkonen @ 2016-05-16 13:22 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
.../gdk-pixbuf/{gdk-pixbuf_2.32.3.bb => gdk-pixbuf_2.34.0.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-gnome/gdk-pixbuf/{gdk-pixbuf_2.32.3.bb => gdk-pixbuf_2.34.0.bb} (96%)
diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.32.3.bb b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.34.0.bb
similarity index 96%
rename from meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.32.3.bb
rename to meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.34.0.bb
index ba94eec..c24ec12 100644
--- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.32.3.bb
+++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.34.0.bb
@@ -19,8 +19,8 @@ SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \
file://fatal-loader.patch \
"
-SRC_URI[md5sum] = "9275076639baa24a342f3e02c402920e"
-SRC_URI[sha256sum] = "2b6771f1ac72f687a8971e59810b8dc658e65e7d3086bd2e676e618fd541d031"
+SRC_URI[md5sum] = "63cb19f92cf7709ccf44bbb6fe1ff70c"
+SRC_URI[sha256sum] = "d55e5b383ee219bd0e23bf6ed4427d56a7db5379729a6e3e0a0e0eba9a8d8879"
inherit autotools pkgconfig gettext pixbufcache ptest-gnome upstream-version-is-even gobject-introspection
--
2.1.4
^ permalink raw reply related [flat|nested] 20+ messages in thread* [PATCH 05/13] gsettings-desktop-schemas: Upgrade 3.19.3 -> 3.20.0
2016-05-16 13:22 [PATCH 00/13] wayland V2 and misc upgrades Jussi Kukkonen
` (3 preceding siblings ...)
2016-05-16 13:22 ` [PATCH 04/13] gdk-pixbuf: Upgrade 2.32.3 -> 2.34.0 Jussi Kukkonen
@ 2016-05-16 13:22 ` Jussi Kukkonen
2016-05-16 13:22 ` [PATCH 06/13] inputproto: Upgrade 2.3.1 -> 2.3.2 Jussi Kukkonen
` (7 subsequent siblings)
12 siblings, 0 replies; 20+ messages in thread
From: Jussi Kukkonen @ 2016-05-16 13:22 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
...desktop-schemas_3.19.3.bb => gsettings-desktop-schemas_3.20.0.bb} | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
rename meta/recipes-gnome/gsettings-desktop-schemas/{gsettings-desktop-schemas_3.19.3.bb => gsettings-desktop-schemas_3.20.0.bb} (68%)
diff --git a/meta/recipes-gnome/gsettings-desktop-schemas/gsettings-desktop-schemas_3.19.3.bb b/meta/recipes-gnome/gsettings-desktop-schemas/gsettings-desktop-schemas_3.20.0.bb
similarity index 68%
rename from meta/recipes-gnome/gsettings-desktop-schemas/gsettings-desktop-schemas_3.19.3.bb
rename to meta/recipes-gnome/gsettings-desktop-schemas/gsettings-desktop-schemas_3.20.0.bb
index 25fdaba..49a701f 100644
--- a/meta/recipes-gnome/gsettings-desktop-schemas/gsettings-desktop-schemas_3.19.3.bb
+++ b/meta/recipes-gnome/gsettings-desktop-schemas/gsettings-desktop-schemas_3.20.0.bb
@@ -9,6 +9,5 @@ DEPENDS = "glib-2.0 intltool-native"
inherit gnomebase gsettings gettext gobject-introspection
-SRC_URI[archive.md5sum] = "fdc92abcffe46821be423193b275cf8b"
-SRC_URI[archive.sha256sum] = "9084989b75ca9b3fc5984c8a0d297a93d3d124f51cadd2bdaaaa75a783c80635"
-
+SRC_URI[archive.md5sum] = "c5d87ea480aa9bf66b134ddb5b8ea0f8"
+SRC_URI[archive.sha256sum] = "55a41b533c0ab955e0a36a84d73829451c88b027d8d719955d8f695c35c6d9c1"
--
2.1.4
^ permalink raw reply related [flat|nested] 20+ messages in thread* [PATCH 06/13] inputproto: Upgrade 2.3.1 -> 2.3.2
2016-05-16 13:22 [PATCH 00/13] wayland V2 and misc upgrades Jussi Kukkonen
` (4 preceding siblings ...)
2016-05-16 13:22 ` [PATCH 05/13] gsettings-desktop-schemas: Upgrade 3.19.3 -> 3.20.0 Jussi Kukkonen
@ 2016-05-16 13:22 ` Jussi Kukkonen
2016-05-16 13:22 ` [PATCH 07/13] json-glib: Upgrade 1.0.4 -> 1.2.0 Jussi Kukkonen
` (6 subsequent siblings)
12 siblings, 0 replies; 20+ messages in thread
From: Jussi Kukkonen @ 2016-05-16 13:22 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
.../xorg-proto/{inputproto_2.3.1.bb => inputproto_2.3.2.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-graphics/xorg-proto/{inputproto_2.3.1.bb => inputproto_2.3.2.bb} (77%)
diff --git a/meta/recipes-graphics/xorg-proto/inputproto_2.3.1.bb b/meta/recipes-graphics/xorg-proto/inputproto_2.3.2.bb
similarity index 77%
rename from meta/recipes-graphics/xorg-proto/inputproto_2.3.1.bb
rename to meta/recipes-graphics/xorg-proto/inputproto_2.3.2.bb
index 7e8e0c1..ae50b87 100644
--- a/meta/recipes-graphics/xorg-proto/inputproto_2.3.1.bb
+++ b/meta/recipes-graphics/xorg-proto/inputproto_2.3.2.bb
@@ -16,5 +16,5 @@ inherit gettext
BBCLASSEXTEND = "native nativesdk"
-SRC_URI[md5sum] = "6caebead4b779ba031727f66a7ffa358"
-SRC_URI[sha256sum] = "5a47ee62053a6acef3a83f506312494be1461068d0b9269d818839703b95c1d1"
+SRC_URI[md5sum] = "b290a463af7def483e6e190de460f31a"
+SRC_URI[sha256sum] = "893a6af55733262058a27b38eeb1edc733669f01d404e8581b167f03c03ef31d"
--
2.1.4
^ permalink raw reply related [flat|nested] 20+ messages in thread* [PATCH 07/13] json-glib: Upgrade 1.0.4 -> 1.2.0
2016-05-16 13:22 [PATCH 00/13] wayland V2 and misc upgrades Jussi Kukkonen
` (5 preceding siblings ...)
2016-05-16 13:22 ` [PATCH 06/13] inputproto: Upgrade 2.3.1 -> 2.3.2 Jussi Kukkonen
@ 2016-05-16 13:22 ` Jussi Kukkonen
2016-05-16 13:22 ` [PATCH 08/13] libsoup-2.4: Upgrade 2.52.2 -> 2.54.1 Jussi Kukkonen
` (5 subsequent siblings)
12 siblings, 0 replies; 20+ messages in thread
From: Jussi Kukkonen @ 2016-05-16 13:22 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
.../json-glib/{json-glib_1.0.4.bb => json-glib_1.2.0.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-gnome/json-glib/{json-glib_1.0.4.bb => json-glib_1.2.0.bb} (78%)
diff --git a/meta/recipes-gnome/json-glib/json-glib_1.0.4.bb b/meta/recipes-gnome/json-glib/json-glib_1.2.0.bb
similarity index 78%
rename from meta/recipes-gnome/json-glib/json-glib_1.0.4.bb
rename to meta/recipes-gnome/json-glib/json-glib_1.2.0.bb
index 3ce38ce..1a7b769 100644
--- a/meta/recipes-gnome/json-glib/json-glib_1.0.4.bb
+++ b/meta/recipes-gnome/json-glib/json-glib_1.2.0.bb
@@ -10,8 +10,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34"
DEPENDS = "glib-2.0"
-SRC_URI[archive.md5sum] = "3131b0417ecde3da1ae72acceaa375cf"
-SRC_URI[archive.sha256sum] = "80f3593cb6bd13f1465828e46a9f740e2e9bd3cd2257889442b3e62bd6de05cd"
+SRC_URI[archive.md5sum] = "efe14b6b8e7aa95ee3240cc60627dc9f"
+SRC_URI[archive.sha256sum] = "99d6dfbe49c08fd7529f1fe8dcb1893b810a1bb222f1e7b65f41507658b8a7d3"
inherit gnomebase gettext lib_package gobject-introspection
--
2.1.4
^ permalink raw reply related [flat|nested] 20+ messages in thread* [PATCH 08/13] libsoup-2.4: Upgrade 2.52.2 -> 2.54.1
2016-05-16 13:22 [PATCH 00/13] wayland V2 and misc upgrades Jussi Kukkonen
` (6 preceding siblings ...)
2016-05-16 13:22 ` [PATCH 07/13] json-glib: Upgrade 1.0.4 -> 1.2.0 Jussi Kukkonen
@ 2016-05-16 13:22 ` Jussi Kukkonen
2016-05-16 13:22 ` [PATCH 09/13] expat: Upgrade 2.1.0 -> 2.1.1 Jussi Kukkonen
` (4 subsequent siblings)
12 siblings, 0 replies; 20+ messages in thread
From: Jussi Kukkonen @ 2016-05-16 13:22 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
.../libsoup/{libsoup-2.4_2.52.2.bb => libsoup-2.4_2.54.1.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-support/libsoup/{libsoup-2.4_2.52.2.bb => libsoup-2.4_2.54.1.bb} (89%)
diff --git a/meta/recipes-support/libsoup/libsoup-2.4_2.52.2.bb b/meta/recipes-support/libsoup/libsoup-2.4_2.54.1.bb
similarity index 89%
rename from meta/recipes-support/libsoup/libsoup-2.4_2.52.2.bb
rename to meta/recipes-support/libsoup/libsoup-2.4_2.54.1.bb
index f6e3db2..ad8202c 100644
--- a/meta/recipes-support/libsoup/libsoup-2.4_2.52.2.bb
+++ b/meta/recipes-support/libsoup/libsoup-2.4_2.54.1.bb
@@ -11,8 +11,8 @@ SHRT_VER = "${@d.getVar('PV', True).split('.')[0]}.${@d.getVar('PV', True).split
SRC_URI = "${GNOME_MIRROR}/libsoup/${SHRT_VER}/libsoup-${PV}.tar.xz"
-SRC_URI[md5sum] = "e4757d09012ed93822b1ee41435fec24"
-SRC_URI[sha256sum] = "db55628b5c7d952945bb71b236469057c8dfb8dea0c271513579c6273c2093dc"
+SRC_URI[md5sum] = "73b1fb774de16c29b380f87016f9f9dd"
+SRC_URI[sha256sum] = "47b42c232034734d66e5f093025843a5d8cc4b2357c011085a2fd04ef02dd633"
S = "${WORKDIR}/libsoup-${PV}"
--
2.1.4
^ permalink raw reply related [flat|nested] 20+ messages in thread* [PATCH 09/13] expat: Upgrade 2.1.0 -> 2.1.1
2016-05-16 13:22 [PATCH 00/13] wayland V2 and misc upgrades Jussi Kukkonen
` (7 preceding siblings ...)
2016-05-16 13:22 ` [PATCH 08/13] libsoup-2.4: Upgrade 2.52.2 -> 2.54.1 Jussi Kukkonen
@ 2016-05-16 13:22 ` Jussi Kukkonen
2016-05-16 13:22 ` [PATCH 10/13] xproto: Upgrade 7.0.28 -> 7.0.29 Jussi Kukkonen
` (3 subsequent siblings)
12 siblings, 0 replies; 20+ messages in thread
From: Jussi Kukkonen @ 2016-05-16 13:22 UTC (permalink / raw)
To: openembedded-core
* Remove backported CVE patch
* Update autotools patch
* Update SRC_URI to match current archive type
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
.../expat/expat-2.1.0/expat-CVE-2015-1283.patch | 62 ----------------------
meta/recipes-core/expat/expat.inc | 3 +-
.../expat/{expat-2.1.0 => expat}/autotools.patch | 4 +-
meta/recipes-core/expat/expat_2.1.0.bb | 5 --
meta/recipes-core/expat/expat_2.1.1.bb | 5 ++
5 files changed, 8 insertions(+), 71 deletions(-)
delete mode 100644 meta/recipes-core/expat/expat-2.1.0/expat-CVE-2015-1283.patch
rename meta/recipes-core/expat/{expat-2.1.0 => expat}/autotools.patch (79%)
delete mode 100644 meta/recipes-core/expat/expat_2.1.0.bb
create mode 100644 meta/recipes-core/expat/expat_2.1.1.bb
diff --git a/meta/recipes-core/expat/expat-2.1.0/expat-CVE-2015-1283.patch b/meta/recipes-core/expat/expat-2.1.0/expat-CVE-2015-1283.patch
deleted file mode 100644
index 1d0acb6..0000000
--- a/meta/recipes-core/expat/expat-2.1.0/expat-CVE-2015-1283.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-Multiple integer overflows in the XML_GetBuffer function in Expat
-through 2.1.0, allow remote attackers to cause a denial of service
-(heap-based buffer overflow) or possibly have unspecified other
-impact via crafted XML data.
-
-CVSSv2: (AV:N/AC:M/Au:N/C:P/I:P/A:P)
-
-CVE: CVE-2015-1283
-Upstream-Status: Backport
-
-Signed-off-by: Eric Rahm <erahm@mozilla.com>
-Signed-off-by: Zhixiong Chi <zhixiong.chi@windirver.com>
-
-Index: expat-2.1.0/lib/xmlparse.c
-===================================================================
---- expat-2.1.0.orig/lib/xmlparse.c 2012-03-11 13:13:12.000000000 +0800
-+++ expat-2.1.0/lib/xmlparse.c 2015-12-23 10:29:07.347361329 +0800
-@@ -1678,6 +1678,12 @@
- void * XMLCALL
- XML_GetBuffer(XML_Parser parser, int len)
- {
-+/* BEGIN MOZILLA CHANGE (sanity check len) */
-+ if (len < 0) {
-+ errorCode = XML_ERROR_NO_MEMORY;
-+ return NULL;
-+ }
-+/* END MOZILLA CHANGE */
- switch (ps_parsing) {
- case XML_SUSPENDED:
- errorCode = XML_ERROR_SUSPENDED;
-@@ -1689,8 +1695,13 @@
- }
-
- if (len > bufferLim - bufferEnd) {
-- /* FIXME avoid integer overflow */
- int neededSize = len + (int)(bufferEnd - bufferPtr);
-+/* BEGIN MOZILLA CHANGE (sanity check neededSize) */
-+ if (neededSize < 0) {
-+ errorCode = XML_ERROR_NO_MEMORY;
-+ return NULL;
-+ }
-+/* END MOZILLA CHANGE */
- #ifdef XML_CONTEXT_BYTES
- int keep = (int)(bufferPtr - buffer);
-
-@@ -1719,7 +1730,15 @@
- bufferSize = INIT_BUFFER_SIZE;
- do {
- bufferSize *= 2;
-- } while (bufferSize < neededSize);
-+/* BEGIN MOZILLA CHANGE (prevent infinite loop on overflow) */
-+ } while (bufferSize < neededSize && bufferSize > 0);
-+/* END MOZILLA CHANGE */
-+/* BEGIN MOZILLA CHANGE (sanity check bufferSize) */
-+ if (bufferSize <= 0) {
-+ errorCode = XML_ERROR_NO_MEMORY;
-+ return NULL;
-+ }
-+/* END MOZILLA CHANGE */
- newBuf = (char *)MALLOC(bufferSize);
- if (newBuf == 0) {
- errorCode = XML_ERROR_NO_MEMORY;
diff --git a/meta/recipes-core/expat/expat.inc b/meta/recipes-core/expat/expat.inc
index 4bd60a2..fe9d7e7 100644
--- a/meta/recipes-core/expat/expat.inc
+++ b/meta/recipes-core/expat/expat.inc
@@ -4,9 +4,8 @@ HOMEPAGE = "http://expat.sourceforge.net/"
SECTION = "libs"
LICENSE = "MIT"
-SRC_URI = "${SOURCEFORGE_MIRROR}/expat/expat-${PV}.tar.gz \
+SRC_URI = "${SOURCEFORGE_MIRROR}/expat/expat-${PV}.tar.bz2 \
file://autotools.patch \
- file://expat-CVE-2015-1283.patch \
"
inherit autotools lib_package gzipnative
diff --git a/meta/recipes-core/expat/expat-2.1.0/autotools.patch b/meta/recipes-core/expat/expat/autotools.patch
similarity index 79%
rename from meta/recipes-core/expat/expat-2.1.0/autotools.patch
rename to meta/recipes-core/expat/expat/autotools.patch
index 0e59969..3d3c5ba 100644
--- a/meta/recipes-core/expat/expat-2.1.0/autotools.patch
+++ b/meta/recipes-core/expat/expat/autotools.patch
@@ -11,8 +11,8 @@ Updated to apply over expat 2.1.0
Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
diff -Nurd expat-2.1.0/configure.in expat-2.1.0/configure.in
---- expat-2.1.0/configure.in 2012-03-04 01:45:53.000000000 +0200
-+++ expat-2.1.0/configure.in 2012-05-10 21:04:44.000000000 +0300
+--- expat-2.1.0/configure.ac 2012-03-04 01:45:53.000000000 +0200
++++ expat-2.1.0/configure.ac 2012-05-10 21:04:44.000000000 +0300
@@ -51,8 +51,6 @@
AC_CONFIG_HEADER(expat_config.h)
diff --git a/meta/recipes-core/expat/expat_2.1.0.bb b/meta/recipes-core/expat/expat_2.1.0.bb
deleted file mode 100644
index b958742..0000000
--- a/meta/recipes-core/expat/expat_2.1.0.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require expat.inc
-LIC_FILES_CHKSUM = "file://COPYING;md5=1b71f681713d1256e1c23b0890920874"
-
-SRC_URI[md5sum] = "dd7dab7a5fea97d2a6a43f511449b7cd"
-SRC_URI[sha256sum] = "823705472f816df21c8f6aa026dd162b280806838bb55b3432b0fb1fcca7eb86"
diff --git a/meta/recipes-core/expat/expat_2.1.1.bb b/meta/recipes-core/expat/expat_2.1.1.bb
new file mode 100644
index 0000000..75c80de
--- /dev/null
+++ b/meta/recipes-core/expat/expat_2.1.1.bb
@@ -0,0 +1,5 @@
+require expat.inc
+LIC_FILES_CHKSUM = "file://COPYING;md5=1b71f681713d1256e1c23b0890920874"
+
+SRC_URI[md5sum] = "7380a64a8e3a9d66a9887b01d0d7ea81"
+SRC_URI[sha256sum] = "aff584e5a2f759dcfc6d48671e9529f6afe1e30b0cd6a4cec200cbe3f793de67"
--
2.1.4
^ permalink raw reply related [flat|nested] 20+ messages in thread* [PATCH 10/13] xproto: Upgrade 7.0.28 -> 7.0.29
2016-05-16 13:22 [PATCH 00/13] wayland V2 and misc upgrades Jussi Kukkonen
` (8 preceding siblings ...)
2016-05-16 13:22 ` [PATCH 09/13] expat: Upgrade 2.1.0 -> 2.1.1 Jussi Kukkonen
@ 2016-05-16 13:22 ` Jussi Kukkonen
2016-05-16 13:22 ` [PATCH 11/13] wayland: Upgrade 1.9.0 -> 1.10.0 Jussi Kukkonen
` (2 subsequent siblings)
12 siblings, 0 replies; 20+ messages in thread
From: Jussi Kukkonen @ 2016-05-16 13:22 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
.../xorg-proto/{xproto_7.0.28.bb => xproto_7.0.29.bb} | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
rename meta/recipes-graphics/xorg-proto/{xproto_7.0.28.bb => xproto_7.0.29.bb} (73%)
diff --git a/meta/recipes-graphics/xorg-proto/xproto_7.0.28.bb b/meta/recipes-graphics/xorg-proto/xproto_7.0.29.bb
similarity index 73%
rename from meta/recipes-graphics/xorg-proto/xproto_7.0.28.bb
rename to meta/recipes-graphics/xorg-proto/xproto_7.0.29.bb
index 7427a7d..412b6a2 100644
--- a/meta/recipes-graphics/xorg-proto/xproto_7.0.28.bb
+++ b/meta/recipes-graphics/xorg-proto/xproto_7.0.29.bb
@@ -15,6 +15,5 @@ SRC_URI += "file://xproto_fix_for_x32.patch"
EXTRA_OECONF_append = " --enable-specs=no"
BBCLASSEXTEND = "native nativesdk"
-SRC_URI[md5sum] = "3ce2f230c5d8fa929f326ad1f0fa40a8"
-SRC_URI[sha256sum] = "29e85568d1f68ceef8a2c081dad9bc0e5500a53cfffde24b564dc43d46ddf6ca"
-
+SRC_URI[md5sum] = "eeeae1f47d43a33ef0d5c56727410326"
+SRC_URI[sha256sum] = "6c1a477092ca73233902b8d5f33012635c4b0208f17e7833cc7efe5c93ba9f8a"
--
2.1.4
^ permalink raw reply related [flat|nested] 20+ messages in thread* [PATCH 11/13] wayland: Upgrade 1.9.0 -> 1.10.0
2016-05-16 13:22 [PATCH 00/13] wayland V2 and misc upgrades Jussi Kukkonen
` (9 preceding siblings ...)
2016-05-16 13:22 ` [PATCH 10/13] xproto: Upgrade 7.0.28 -> 7.0.29 Jussi Kukkonen
@ 2016-05-16 13:22 ` Jussi Kukkonen
2016-05-16 13:22 ` [PATCH 12/13] wayland-protocols: Add recipe Jussi Kukkonen
2016-05-16 13:22 ` [PATCH 13/13] weston: Upgrade 1.9.0 -> 1.10.0 Jussi Kukkonen
12 siblings, 0 replies; 20+ messages in thread
From: Jussi Kukkonen @ 2016-05-16 13:22 UTC (permalink / raw)
To: openembedded-core
Yes, Wayland now depends on another xml parser (just for build time
dtd validation).
Use HTTPS for tarball uri.
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
.../wayland/{wayland_1.9.0.bb => wayland_1.10.0.bb} | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
rename meta/recipes-graphics/wayland/{wayland_1.9.0.bb => wayland_1.10.0.bb} (85%)
diff --git a/meta/recipes-graphics/wayland/wayland_1.9.0.bb b/meta/recipes-graphics/wayland/wayland_1.10.0.bb
similarity index 85%
rename from meta/recipes-graphics/wayland/wayland_1.9.0.bb
rename to meta/recipes-graphics/wayland/wayland_1.10.0.bb
index d12ac18..41d08b7 100644
--- a/meta/recipes-graphics/wayland/wayland_1.9.0.bb
+++ b/meta/recipes-graphics/wayland/wayland_1.10.0.bb
@@ -10,9 +10,9 @@ LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://COPYING;md5=b31d8f53b6aaf2b4985d7dd7810a70d1 \
file://src/wayland-server.c;endline=24;md5=b8e046164a766bb1ede8ba38e9dcd7ce"
-SRC_URI = "http://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz"
-SRC_URI[md5sum] = "5e141b3f2a7005d6c89d6f233c87c317"
-SRC_URI[sha256sum] = "9c8770720aa0034479735f58a4dc4ca9b172ecfede28f5134312e135b7301efa"
+SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz"
+SRC_URI[md5sum] = "e7751c38807c231afaba9d6b68f2a2b7"
+SRC_URI[sha256sum] = "4bf6e790aa6f50ab3825676282ecd75850ec9c4767af96ecb7127b1f3c3d60dc"
EXTRA_OECONF_class-native = "--disable-documentation --disable-libraries"
@@ -20,7 +20,7 @@ inherit autotools pkgconfig
BBCLASSEXTEND = "native nativesdk"
-DEPENDS = "expat libffi wayland-native"
+DEPENDS = "expat libxml2 libffi wayland-native"
EXTRA_OECONF = "--disable-documentation --with-host-scanner"
--
2.1.4
^ permalink raw reply related [flat|nested] 20+ messages in thread* [PATCH 12/13] wayland-protocols: Add recipe
2016-05-16 13:22 [PATCH 00/13] wayland V2 and misc upgrades Jussi Kukkonen
` (10 preceding siblings ...)
2016-05-16 13:22 ` [PATCH 11/13] wayland: Upgrade 1.9.0 -> 1.10.0 Jussi Kukkonen
@ 2016-05-16 13:22 ` Jussi Kukkonen
2016-05-16 13:22 ` [PATCH 13/13] weston: Upgrade 1.9.0 -> 1.10.0 Jussi Kukkonen
12 siblings, 0 replies; 20+ messages in thread
From: Jussi Kukkonen @ 2016-05-16 13:22 UTC (permalink / raw)
To: openembedded-core
wayland-protocols is a collection of Wayland protocols split
out from weston. It is a build dependency for Weston 1.10.
* Added a patch to enable allarch build.
* Use HTTPS for tarball uri.
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
.../wayland-protocols/dont-use-AC_CANONICAL.patch | 29 ++++++++++++++++++++++
.../wayland/wayland-protocols_1.3.bb | 20 +++++++++++++++
2 files changed, 49 insertions(+)
create mode 100644 meta/recipes-graphics/wayland/wayland-protocols/dont-use-AC_CANONICAL.patch
create mode 100644 meta/recipes-graphics/wayland/wayland-protocols_1.3.bb
diff --git a/meta/recipes-graphics/wayland/wayland-protocols/dont-use-AC_CANONICAL.patch b/meta/recipes-graphics/wayland/wayland-protocols/dont-use-AC_CANONICAL.patch
new file mode 100644
index 0000000..6cc0f3b
--- /dev/null
+++ b/meta/recipes-graphics/wayland/wayland-protocols/dont-use-AC_CANONICAL.patch
@@ -0,0 +1,29 @@
+Check autoconfs $cross_compiling instead as AC_CANONICAL_HOST call
+will fail if the host cpu is not recognised (which can happen when
+e.g. Yocto builds for "allarch").
+
+Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
+Upstream-Status: Backport [cc276dfa41]
+
+diff --git a/configure.ac b/configure.ac
+index 5b48b1a..3d45a4b 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -15,13 +15,10 @@ AC_CONFIG_MACRO_DIR([m4])
+
+ AC_SUBST([WAYLAND_PROTOCOLS_VERSION], [wayland_protocols_version])
+
+-AC_CANONICAL_HOST
+-AC_CANONICAL_BUILD
+-
+ AC_ARG_VAR([wayland_scanner], [The wayland-scanner executable])
+ AC_PATH_PROG([wayland_scanner], [wayland-scanner])
+ if test x$wayland_scanner = x; then
+- if test x$host = x$build; then
++ if test "x$cross_compiling" != "xyes"; then
+ PKG_CHECK_MODULES(WAYLAND_SCANNER, [wayland-scanner])
+ wayland_scanner=`$PKG_CONFIG --variable=wayland_scanner wayland-scanner`
+ else
+--
+cgit v0.10.2
+
diff --git a/meta/recipes-graphics/wayland/wayland-protocols_1.3.bb b/meta/recipes-graphics/wayland/wayland-protocols_1.3.bb
new file mode 100644
index 0000000..86e89b5
--- /dev/null
+++ b/meta/recipes-graphics/wayland/wayland-protocols_1.3.bb
@@ -0,0 +1,20 @@
+SUMMARY = "Collection of additional Wayland protocols"
+DESCRIPTION = "Wayland protocols that add functionality not \
+available in the Wayland core protocol. Such protocols either add \
+completely new functionality, or extend the functionality of some other \
+protocol either in Wayland core, or some other protocol in \
+wayland-protocols."
+HOMEPAGE = "http://wayland.freedesktop.org"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://COPYING;md5=c7b12b6702da38ca028ace54aae3d484 \
+ file://stable/presentation-time/presentation-time.xml;endline=26;md5=4646cd7d9edc9fa55db941f2d3a7dc53"
+
+SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \
+ file://dont-use-AC_CANONICAL.patch"
+SRC_URI[md5sum] = "88b5e3dce52908c7e74fad3e2cf8abb0"
+SRC_URI[sha256sum] = "6bcd0633fdf9225ef1c7d2831f542e947f7d79811c79fc37f57b2e5375ded82f"
+
+inherit allarch autotools pkgconfig
+
+PACKAGES = "${PN}"
+FILES_${PN} += "${datadir}/pkgconfig/wayland-protocols.pc"
--
2.1.4
^ permalink raw reply related [flat|nested] 20+ messages in thread* [PATCH 13/13] weston: Upgrade 1.9.0 -> 1.10.0
2016-05-16 13:22 [PATCH 00/13] wayland V2 and misc upgrades Jussi Kukkonen
` (11 preceding siblings ...)
2016-05-16 13:22 ` [PATCH 12/13] wayland-protocols: Add recipe Jussi Kukkonen
@ 2016-05-16 13:22 ` Jussi Kukkonen
2016-05-16 15:37 ` Denys Dmytriyenko
12 siblings, 1 reply; 20+ messages in thread
From: Jussi Kukkonen @ 2016-05-16 13:22 UTC (permalink / raw)
To: openembedded-core
Support for multiple new protocols, many new features:
https://lists.freedesktop.org/archives/wayland-devel/2016-February/027039.html
* Weston now depends on wayland-protocols (which is protocol
collection split off from weston).
* Remove upstreamed patches, add a patch to fix the wayland-protocols
path used during build.
* Use HTTPS for tarball download
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
...1-configure.ac-Fix-wayland-protocols-path.patch | 34 +++++++++++
.../weston/explicit-enable-disable-systemd.patch | 70 ----------------------
.../wayland/weston/libsystemd.patch | 53 ----------------
.../weston/make-lcms-explicitly-configurable.patch | 43 -------------
.../wayland/{weston_1.9.0.bb => weston_1.10.0.bb} | 14 ++---
5 files changed, 41 insertions(+), 173 deletions(-)
create mode 100644 meta/recipes-graphics/wayland/weston/0001-configure.ac-Fix-wayland-protocols-path.patch
delete mode 100644 meta/recipes-graphics/wayland/weston/explicit-enable-disable-systemd.patch
delete mode 100644 meta/recipes-graphics/wayland/weston/libsystemd.patch
delete mode 100644 meta/recipes-graphics/wayland/weston/make-lcms-explicitly-configurable.patch
rename meta/recipes-graphics/wayland/{weston_1.9.0.bb => weston_1.10.0.bb} (89%)
diff --git a/meta/recipes-graphics/wayland/weston/0001-configure.ac-Fix-wayland-protocols-path.patch b/meta/recipes-graphics/wayland/weston/0001-configure.ac-Fix-wayland-protocols-path.patch
new file mode 100644
index 0000000..7e00038
--- /dev/null
+++ b/meta/recipes-graphics/wayland/weston/0001-configure.ac-Fix-wayland-protocols-path.patch
@@ -0,0 +1,34 @@
+From 1cfc1434a5d385a74de593ec7601674dba39e2fe Mon Sep 17 00:00:00 2001
+From: Jussi Kukkonen <jussi.kukkonen@intel.com>
+Date: Wed, 11 May 2016 16:16:30 +0300
+Subject: [PATCH] configure.ac: Fix wayland-protocols path
+
+The wayland-protocols directory is used during build: Fix the path
+to point to sysroot specified in recipe.
+
+Normally PKG_CONFIG_SYSROOT_DIR could be used in configure.ac but that
+breaks multilib weston as it would point to multilib sysroot when the
+(allarch) wayland-protocols is actually in the machine sysroot.
+
+Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
+Upstream-Status: Inappropriate [embedded specific]
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index bc7c329..15a05d3 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -184,7 +184,7 @@ PKG_CHECK_MODULES(LIBINPUT_BACKEND, [libinput >= 0.8.0])
+ PKG_CHECK_MODULES(COMPOSITOR, [$COMPOSITOR_MODULES])
+
+ PKG_CHECK_MODULES(WAYLAND_PROTOCOLS, [wayland-protocols >= 1.0],
+- [ac_wayland_protocols_pkgdatadir=`$PKG_CONFIG --variable=pkgdatadir wayland-protocols`])
++ [ac_wayland_protocols_pkgdatadir=${WAYLAND_PROTOCOLS_SYSROOT_DIR}`$PKG_CONFIG --variable=pkgdatadir wayland-protocols`])
+ AC_SUBST(WAYLAND_PROTOCOLS_DATADIR, $ac_wayland_protocols_pkgdatadir)
+
+ AC_ARG_ENABLE(wayland-compositor, [ --enable-wayland-compositor],,
+--
+2.1.4
+
diff --git a/meta/recipes-graphics/wayland/weston/explicit-enable-disable-systemd.patch b/meta/recipes-graphics/wayland/weston/explicit-enable-disable-systemd.patch
deleted file mode 100644
index a40eaf1..0000000
--- a/meta/recipes-graphics/wayland/weston/explicit-enable-disable-systemd.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From 8e1efcd40b3bad81c83744e2e120d70c2b567ef2 Mon Sep 17 00:00:00 2001
-From: Frederico Cadete <frederico@cadete.eu>
-Date: Mon, 28 Sep 2015 00:30:10 +0200
-Subject: configure.ac: add explicit enable/disable for systemd-login support
-
-Otherwise, auto-enable depending on whether the system has the necessary
-libraries.
-
-[Updated help text as per pq suggestion -- bwh]
-
-Reviewed-by: Bryce Harrington <bryce@osg.samsung.com>
-Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
-Tested-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
-
-Upstream-Status: Backport
-Backported from Weston git:
-http://cgit.freedesktop.org/wayland/weston/commit/?id=8e1efc
-
-Signed-off-by: Joshua Lock <joshua.lock@collabora.co.uk>
-
-diff --git a/configure.ac b/configure.ac
-index a9cd429..67e80d0 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -380,18 +380,30 @@ AC_ARG_ENABLE(resize-optimization,
- AS_IF([test "x$enable_resize_optimization" = "xyes"],
- [AC_DEFINE([USE_RESIZE_POOL], [1], [Use resize memory pool as a performance optimization])])
-
--PKG_CHECK_MODULES(SYSTEMD_LOGIN,
-- [libsystemd >= 209],
-- [have_systemd_login_209=yes;have_systemd_login=yes],
-- [have_systemd_login_209=no;have_systemd_login=no])
--
--# Older versions of systemd package systemd-login separately. Fall back on that
--AS_IF([test x$have_systemd_login != xyes],[
-- PKG_CHECK_MODULES(SYSTEMD_LOGIN,
-- [libsystemd-login >= 198],
-- [have_systemd_login=yes],
-- [have_systemd_login=no])
-- ])
-+AC_ARG_ENABLE(systemd-login,
-+ AS_HELP_STRING([--enable-systemd-login],
-+ [Enable logind support]),,
-+ enable_systemd_login=auto)
-+if test x$enable_systemd_login != xno; then
-+ PKG_CHECK_MODULES(SYSTEMD_LOGIN,
-+ [libsystemd >= 209],
-+ [have_systemd_login_209=yes;have_systemd_login=yes],
-+ [have_systemd_login_209=no;have_systemd_login=no])
-+
-+ # Older versions of systemd package systemd-login separately. Fall back on that
-+ AS_IF([test x$have_systemd_login != xyes],[
-+ PKG_CHECK_MODULES(SYSTEMD_LOGIN,
-+ [libsystemd-login >= 198],
-+ [have_systemd_login=yes],
-+ [have_systemd_login=no])
-+ ])
-+else
-+ have_systemd_login=no
-+fi
-+
-+if test "x$have_systemd_login" = "xno" -a "x$enable_systemd_login" = "xyes"; then
-+ AC_MSG_ERROR([systemd-login support explicitly enabled, but can't find libsystemd>=209 or libsystemd-login])
-+fi
-
- AS_IF([test "x$have_systemd_login" = "xyes"],
- [AC_DEFINE([HAVE_SYSTEMD_LOGIN], [1], [Have systemd-login])])
---
-cgit v0.10.2
-
diff --git a/meta/recipes-graphics/wayland/weston/libsystemd.patch b/meta/recipes-graphics/wayland/weston/libsystemd.patch
deleted file mode 100644
index 2d28d56..0000000
--- a/meta/recipes-graphics/wayland/weston/libsystemd.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 5eb025a867b42f8bc7bc73279eac8de58e51a13e Mon Sep 17 00:00:00 2001
-From: Frederico Cadete <frederico@cadete.eu>
-Date: Mon, 28 Sep 2015 00:30:09 +0200
-Subject: configure.ac: add support for new versions of systemd
-
-Starting from systemd version 209, a single libsystemd.pc is provided.
-For previous versions, fall back on libsystemd-login.pc.
-
-Signed-off-by: Frederico Cadete <frederico@cadete.eu>
-Reviewed-by: Bryce Harrington <bryce@osg.samsung.com>
-Reviewed-by: Derek Foreman <derekf@osg.samsung.com>
-
-Upstream-Status: Backport
-Backported from Weston git:
-http://cgit.freedesktop.org/wayland/weston/commit/?id=5eb025
-
-Signed-off-by: Joshua Lock <joshua.lock@collabora.co.uk>
-
-diff --git a/configure.ac b/configure.ac
-index 045291c..a9cd429 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -380,14 +380,23 @@ AC_ARG_ENABLE(resize-optimization,
- AS_IF([test "x$enable_resize_optimization" = "xyes"],
- [AC_DEFINE([USE_RESIZE_POOL], [1], [Use resize memory pool as a performance optimization])])
-
--PKG_CHECK_MODULES(SYSTEMD_LOGIN, [libsystemd-login >= 198],
-- [have_systemd_login=yes], [have_systemd_login=no])
-+PKG_CHECK_MODULES(SYSTEMD_LOGIN,
-+ [libsystemd >= 209],
-+ [have_systemd_login_209=yes;have_systemd_login=yes],
-+ [have_systemd_login_209=no;have_systemd_login=no])
-+
-+# Older versions of systemd package systemd-login separately. Fall back on that
-+AS_IF([test x$have_systemd_login != xyes],[
-+ PKG_CHECK_MODULES(SYSTEMD_LOGIN,
-+ [libsystemd-login >= 198],
-+ [have_systemd_login=yes],
-+ [have_systemd_login=no])
-+ ])
-+
- AS_IF([test "x$have_systemd_login" = "xyes"],
- [AC_DEFINE([HAVE_SYSTEMD_LOGIN], [1], [Have systemd-login])])
- AM_CONDITIONAL(HAVE_SYSTEMD_LOGIN, test "x$have_systemd_login" = "xyes")
-
--PKG_CHECK_MODULES(SYSTEMD_LOGIN_209, [libsystemd-login >= 209],
-- [have_systemd_login_209=yes], [have_systemd_login_209=no])
- AS_IF([test "x$have_systemd_login_209" = "xyes"],
- [AC_DEFINE([HAVE_SYSTEMD_LOGIN_209], [1], [Have systemd-login >= 209])])
-
---
-cgit v0.10.2
-
diff --git a/meta/recipes-graphics/wayland/weston/make-lcms-explicitly-configurable.patch b/meta/recipes-graphics/wayland/weston/make-lcms-explicitly-configurable.patch
deleted file mode 100644
index 35e6d6f..0000000
--- a/meta/recipes-graphics/wayland/weston/make-lcms-explicitly-configurable.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-weston-1.5.0/configure.ac: make lcms explicitly configurable
-
-The lcms package is outside of openembedded-core, so make it
-explicitly configurable. Make it deterministic, so that if lcms
-dependencies are missing, autoconf throws a fatal error. Follow
-upstream style to make it more likely to be merged.
-
-Upstream-Status: Pending
-
-Index: weston-1.5.0/configure.ac
-===================================================================
---- weston-1.5.0.orig/configure.ac
-+++ weston-1.5.0/configure.ac
-@@ -491,12 +491,24 @@ AC_ARG_ENABLE(demo-clients-install,
- enable_demo_clients_install=no)
- AM_CONDITIONAL(INSTALL_DEMO_CLIENTS, [test "x$enable_demo_clients_install" = "xyes"])
-
--PKG_CHECK_MODULES(LCMS, lcms2,
-- [have_lcms=yes], [have_lcms=no])
--if test "x$have_lcms" = xyes; then
-- AC_DEFINE(HAVE_LCMS, 1, [Have lcms support])
-+AC_ARG_ENABLE(lcms,
-+ AS_HELP_STRING([--disable-lcms],
-+ [Disable lcms support]),,
-+ enable_lcms=auto)
-+AM_CONDITIONAL(HAVE_LCMS, [test "x$enable_lcms" = xyes])
-+if test "x$enable_lcms" != "xno"; then
-+ PKG_CHECK_MODULES(LCMS,
-+ lcms2,
-+ [have_lcms=yes],
-+ [have_lcms=no])
-+ if test "x$have_lcms" = "xno" -a "x$enable_lcms" = "xyes"; then
-+ AC_MSG_ERROR([lcms support explicitly requested, but lcms couldn't be found])
-+ fi
-+ if test "x$have_lcms" = "xyes"; then
-+ enable_lcms=yes
-+ AC_DEFINE(HAVE_LCMS, 1, [Have lcms support])
-+ fi
- fi
--AM_CONDITIONAL(HAVE_LCMS, [test "x$have_lcms" = xyes])
-
- AC_PATH_PROG([wayland_scanner], [wayland-scanner])
- if test x$wayland_scanner = x; then
diff --git a/meta/recipes-graphics/wayland/weston_1.9.0.bb b/meta/recipes-graphics/wayland/weston_1.10.0.bb
similarity index 89%
rename from meta/recipes-graphics/wayland/weston_1.9.0.bb
rename to meta/recipes-graphics/wayland/weston_1.10.0.bb
index 16a788d..3eccb1f 100644
--- a/meta/recipes-graphics/wayland/weston_1.9.0.bb
+++ b/meta/recipes-graphics/wayland/weston_1.10.0.bb
@@ -5,24 +5,22 @@ LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://COPYING;md5=d79ee9e66bb0f95d3386a7acae780b70 \
file://src/compositor.c;endline=23;md5=1d535fed266cf39f6d8c0647f52ac331"
-SRC_URI = "http://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \
+SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \
file://weston.png \
file://weston.desktop \
- file://make-lcms-explicitly-configurable.patch \
file://make-libwebp-explicitly-configurable.patch \
file://0001-make-error-portable.patch \
- file://libsystemd.patch \
- file://explicit-enable-disable-systemd.patch \
+ file://0001-configure.ac-Fix-wayland-protocols-path.patch \
"
-SRC_URI[md5sum] = "66bbba12f546570b4d97f676bc79a28e"
-SRC_URI[sha256sum] = "9c1b03f3184fa0b0dfdf67e215048085156e1a2ca344af6613fed36794ac48cf"
+SRC_URI[md5sum] = "1cd17c54ecac6d9a3cd90bf12eaa3e20"
+SRC_URI[sha256sum] = "e0b2004d00d8293ddf7903ca283c1746afa9ccb5919ab50fd04397ff472aa5c1"
inherit autotools pkgconfig useradd distro_features_check
# depends on virtual/egl
REQUIRED_DISTRO_FEATURES = "opengl"
DEPENDS = "libxkbcommon gdk-pixbuf pixman cairo glib-2.0 jpeg"
-DEPENDS += "wayland libinput virtual/egl pango wayland-native"
+DEPENDS += "wayland wayland-protocols libinput virtual/egl pango wayland-native"
EXTRA_OECONF = "--enable-setuid-install \
--enable-simple-clients \
@@ -30,6 +28,7 @@ EXTRA_OECONF = "--enable-setuid-install \
--enable-demo-clients-install \
--disable-rpi-compositor \
--disable-rdp-compositor \
+ WAYLAND_PROTOCOLS_SYSROOT_DIR=${STAGING_DIR}/${MACHINE} \
"
EXTRA_OECONF_append_qemux86 = "\
@@ -98,6 +97,7 @@ FILES_${PN}-examples = "${bindir}/*"
RDEPENDS_${PN} += "xkeyboard-config"
RRECOMMENDS_${PN} = "liberation-fonts"
+RRECOMMENDS_${PN}-dev += "wayland-protocols"
USERADD_PACKAGES = "${PN}"
GROUPADD_PARAM_${PN} = "--system weston-launch"
--
2.1.4
^ permalink raw reply related [flat|nested] 20+ messages in thread* Re: [PATCH 13/13] weston: Upgrade 1.9.0 -> 1.10.0
2016-05-16 13:22 ` [PATCH 13/13] weston: Upgrade 1.9.0 -> 1.10.0 Jussi Kukkonen
@ 2016-05-16 15:37 ` Denys Dmytriyenko
0 siblings, 0 replies; 20+ messages in thread
From: Denys Dmytriyenko @ 2016-05-16 15:37 UTC (permalink / raw)
To: Jussi Kukkonen; +Cc: openembedded-core
On Mon, May 16, 2016 at 04:22:50PM +0300, Jussi Kukkonen wrote:
> Support for multiple new protocols, many new features:
> https://lists.freedesktop.org/archives/wayland-devel/2016-February/027039.html
>
> * Weston now depends on wayland-protocols (which is protocol
> collection split off from weston).
Thanks! I've been looking into this update recently, but haven't been able to
finish wayland-protocols work yet due to lack of time... Appreciate you taking
a stab at it!
> * Remove upstreamed patches, add a patch to fix the wayland-protocols
> path used during build.
> * Use HTTPS for tarball download
>
> Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
> ---
> ...1-configure.ac-Fix-wayland-protocols-path.patch | 34 +++++++++++
> .../weston/explicit-enable-disable-systemd.patch | 70 ----------------------
> .../wayland/weston/libsystemd.patch | 53 ----------------
> .../weston/make-lcms-explicitly-configurable.patch | 43 -------------
> .../wayland/{weston_1.9.0.bb => weston_1.10.0.bb} | 14 ++---
> 5 files changed, 41 insertions(+), 173 deletions(-)
> create mode 100644 meta/recipes-graphics/wayland/weston/0001-configure.ac-Fix-wayland-protocols-path.patch
> delete mode 100644 meta/recipes-graphics/wayland/weston/explicit-enable-disable-systemd.patch
> delete mode 100644 meta/recipes-graphics/wayland/weston/libsystemd.patch
> delete mode 100644 meta/recipes-graphics/wayland/weston/make-lcms-explicitly-configurable.patch
> rename meta/recipes-graphics/wayland/{weston_1.9.0.bb => weston_1.10.0.bb} (89%)
>
> diff --git a/meta/recipes-graphics/wayland/weston/0001-configure.ac-Fix-wayland-protocols-path.patch b/meta/recipes-graphics/wayland/weston/0001-configure.ac-Fix-wayland-protocols-path.patch
> new file mode 100644
> index 0000000..7e00038
> --- /dev/null
> +++ b/meta/recipes-graphics/wayland/weston/0001-configure.ac-Fix-wayland-protocols-path.patch
> @@ -0,0 +1,34 @@
> +From 1cfc1434a5d385a74de593ec7601674dba39e2fe Mon Sep 17 00:00:00 2001
> +From: Jussi Kukkonen <jussi.kukkonen@intel.com>
> +Date: Wed, 11 May 2016 16:16:30 +0300
> +Subject: [PATCH] configure.ac: Fix wayland-protocols path
> +
> +The wayland-protocols directory is used during build: Fix the path
> +to point to sysroot specified in recipe.
> +
> +Normally PKG_CONFIG_SYSROOT_DIR could be used in configure.ac but that
> +breaks multilib weston as it would point to multilib sysroot when the
> +(allarch) wayland-protocols is actually in the machine sysroot.
> +
> +Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
> +Upstream-Status: Inappropriate [embedded specific]
> +---
> + configure.ac | 2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
> +
> +diff --git a/configure.ac b/configure.ac
> +index bc7c329..15a05d3 100644
> +--- a/configure.ac
> ++++ b/configure.ac
> +@@ -184,7 +184,7 @@ PKG_CHECK_MODULES(LIBINPUT_BACKEND, [libinput >= 0.8.0])
> + PKG_CHECK_MODULES(COMPOSITOR, [$COMPOSITOR_MODULES])
> +
> + PKG_CHECK_MODULES(WAYLAND_PROTOCOLS, [wayland-protocols >= 1.0],
> +- [ac_wayland_protocols_pkgdatadir=`$PKG_CONFIG --variable=pkgdatadir wayland-protocols`])
> ++ [ac_wayland_protocols_pkgdatadir=${WAYLAND_PROTOCOLS_SYSROOT_DIR}`$PKG_CONFIG --variable=pkgdatadir wayland-protocols`])
> + AC_SUBST(WAYLAND_PROTOCOLS_DATADIR, $ac_wayland_protocols_pkgdatadir)
> +
> + AC_ARG_ENABLE(wayland-compositor, [ --enable-wayland-compositor],,
> +--
> +2.1.4
> +
> diff --git a/meta/recipes-graphics/wayland/weston/explicit-enable-disable-systemd.patch b/meta/recipes-graphics/wayland/weston/explicit-enable-disable-systemd.patch
> deleted file mode 100644
> index a40eaf1..0000000
> --- a/meta/recipes-graphics/wayland/weston/explicit-enable-disable-systemd.patch
> +++ /dev/null
> @@ -1,70 +0,0 @@
> -From 8e1efcd40b3bad81c83744e2e120d70c2b567ef2 Mon Sep 17 00:00:00 2001
> -From: Frederico Cadete <frederico@cadete.eu>
> -Date: Mon, 28 Sep 2015 00:30:10 +0200
> -Subject: configure.ac: add explicit enable/disable for systemd-login support
> -
> -Otherwise, auto-enable depending on whether the system has the necessary
> -libraries.
> -
> -[Updated help text as per pq suggestion -- bwh]
> -
> -Reviewed-by: Bryce Harrington <bryce@osg.samsung.com>
> -Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
> -Tested-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
> -
> -Upstream-Status: Backport
> -Backported from Weston git:
> -http://cgit.freedesktop.org/wayland/weston/commit/?id=8e1efc
> -
> -Signed-off-by: Joshua Lock <joshua.lock@collabora.co.uk>
> -
> -diff --git a/configure.ac b/configure.ac
> -index a9cd429..67e80d0 100644
> ---- a/configure.ac
> -+++ b/configure.ac
> -@@ -380,18 +380,30 @@ AC_ARG_ENABLE(resize-optimization,
> - AS_IF([test "x$enable_resize_optimization" = "xyes"],
> - [AC_DEFINE([USE_RESIZE_POOL], [1], [Use resize memory pool as a performance optimization])])
> -
> --PKG_CHECK_MODULES(SYSTEMD_LOGIN,
> -- [libsystemd >= 209],
> -- [have_systemd_login_209=yes;have_systemd_login=yes],
> -- [have_systemd_login_209=no;have_systemd_login=no])
> --
> --# Older versions of systemd package systemd-login separately. Fall back on that
> --AS_IF([test x$have_systemd_login != xyes],[
> -- PKG_CHECK_MODULES(SYSTEMD_LOGIN,
> -- [libsystemd-login >= 198],
> -- [have_systemd_login=yes],
> -- [have_systemd_login=no])
> -- ])
> -+AC_ARG_ENABLE(systemd-login,
> -+ AS_HELP_STRING([--enable-systemd-login],
> -+ [Enable logind support]),,
> -+ enable_systemd_login=auto)
> -+if test x$enable_systemd_login != xno; then
> -+ PKG_CHECK_MODULES(SYSTEMD_LOGIN,
> -+ [libsystemd >= 209],
> -+ [have_systemd_login_209=yes;have_systemd_login=yes],
> -+ [have_systemd_login_209=no;have_systemd_login=no])
> -+
> -+ # Older versions of systemd package systemd-login separately. Fall back on that
> -+ AS_IF([test x$have_systemd_login != xyes],[
> -+ PKG_CHECK_MODULES(SYSTEMD_LOGIN,
> -+ [libsystemd-login >= 198],
> -+ [have_systemd_login=yes],
> -+ [have_systemd_login=no])
> -+ ])
> -+else
> -+ have_systemd_login=no
> -+fi
> -+
> -+if test "x$have_systemd_login" = "xno" -a "x$enable_systemd_login" = "xyes"; then
> -+ AC_MSG_ERROR([systemd-login support explicitly enabled, but can't find libsystemd>=209 or libsystemd-login])
> -+fi
> -
> - AS_IF([test "x$have_systemd_login" = "xyes"],
> - [AC_DEFINE([HAVE_SYSTEMD_LOGIN], [1], [Have systemd-login])])
> ---
> -cgit v0.10.2
> -
> diff --git a/meta/recipes-graphics/wayland/weston/libsystemd.patch b/meta/recipes-graphics/wayland/weston/libsystemd.patch
> deleted file mode 100644
> index 2d28d56..0000000
> --- a/meta/recipes-graphics/wayland/weston/libsystemd.patch
> +++ /dev/null
> @@ -1,53 +0,0 @@
> -From 5eb025a867b42f8bc7bc73279eac8de58e51a13e Mon Sep 17 00:00:00 2001
> -From: Frederico Cadete <frederico@cadete.eu>
> -Date: Mon, 28 Sep 2015 00:30:09 +0200
> -Subject: configure.ac: add support for new versions of systemd
> -
> -Starting from systemd version 209, a single libsystemd.pc is provided.
> -For previous versions, fall back on libsystemd-login.pc.
> -
> -Signed-off-by: Frederico Cadete <frederico@cadete.eu>
> -Reviewed-by: Bryce Harrington <bryce@osg.samsung.com>
> -Reviewed-by: Derek Foreman <derekf@osg.samsung.com>
> -
> -Upstream-Status: Backport
> -Backported from Weston git:
> -http://cgit.freedesktop.org/wayland/weston/commit/?id=5eb025
> -
> -Signed-off-by: Joshua Lock <joshua.lock@collabora.co.uk>
> -
> -diff --git a/configure.ac b/configure.ac
> -index 045291c..a9cd429 100644
> ---- a/configure.ac
> -+++ b/configure.ac
> -@@ -380,14 +380,23 @@ AC_ARG_ENABLE(resize-optimization,
> - AS_IF([test "x$enable_resize_optimization" = "xyes"],
> - [AC_DEFINE([USE_RESIZE_POOL], [1], [Use resize memory pool as a performance optimization])])
> -
> --PKG_CHECK_MODULES(SYSTEMD_LOGIN, [libsystemd-login >= 198],
> -- [have_systemd_login=yes], [have_systemd_login=no])
> -+PKG_CHECK_MODULES(SYSTEMD_LOGIN,
> -+ [libsystemd >= 209],
> -+ [have_systemd_login_209=yes;have_systemd_login=yes],
> -+ [have_systemd_login_209=no;have_systemd_login=no])
> -+
> -+# Older versions of systemd package systemd-login separately. Fall back on that
> -+AS_IF([test x$have_systemd_login != xyes],[
> -+ PKG_CHECK_MODULES(SYSTEMD_LOGIN,
> -+ [libsystemd-login >= 198],
> -+ [have_systemd_login=yes],
> -+ [have_systemd_login=no])
> -+ ])
> -+
> - AS_IF([test "x$have_systemd_login" = "xyes"],
> - [AC_DEFINE([HAVE_SYSTEMD_LOGIN], [1], [Have systemd-login])])
> - AM_CONDITIONAL(HAVE_SYSTEMD_LOGIN, test "x$have_systemd_login" = "xyes")
> -
> --PKG_CHECK_MODULES(SYSTEMD_LOGIN_209, [libsystemd-login >= 209],
> -- [have_systemd_login_209=yes], [have_systemd_login_209=no])
> - AS_IF([test "x$have_systemd_login_209" = "xyes"],
> - [AC_DEFINE([HAVE_SYSTEMD_LOGIN_209], [1], [Have systemd-login >= 209])])
> -
> ---
> -cgit v0.10.2
> -
> diff --git a/meta/recipes-graphics/wayland/weston/make-lcms-explicitly-configurable.patch b/meta/recipes-graphics/wayland/weston/make-lcms-explicitly-configurable.patch
> deleted file mode 100644
> index 35e6d6f..0000000
> --- a/meta/recipes-graphics/wayland/weston/make-lcms-explicitly-configurable.patch
> +++ /dev/null
> @@ -1,43 +0,0 @@
> -weston-1.5.0/configure.ac: make lcms explicitly configurable
> -
> -The lcms package is outside of openembedded-core, so make it
> -explicitly configurable. Make it deterministic, so that if lcms
> -dependencies are missing, autoconf throws a fatal error. Follow
> -upstream style to make it more likely to be merged.
> -
> -Upstream-Status: Pending
> -
> -Index: weston-1.5.0/configure.ac
> -===================================================================
> ---- weston-1.5.0.orig/configure.ac
> -+++ weston-1.5.0/configure.ac
> -@@ -491,12 +491,24 @@ AC_ARG_ENABLE(demo-clients-install,
> - enable_demo_clients_install=no)
> - AM_CONDITIONAL(INSTALL_DEMO_CLIENTS, [test "x$enable_demo_clients_install" = "xyes"])
> -
> --PKG_CHECK_MODULES(LCMS, lcms2,
> -- [have_lcms=yes], [have_lcms=no])
> --if test "x$have_lcms" = xyes; then
> -- AC_DEFINE(HAVE_LCMS, 1, [Have lcms support])
> -+AC_ARG_ENABLE(lcms,
> -+ AS_HELP_STRING([--disable-lcms],
> -+ [Disable lcms support]),,
> -+ enable_lcms=auto)
> -+AM_CONDITIONAL(HAVE_LCMS, [test "x$enable_lcms" = xyes])
> -+if test "x$enable_lcms" != "xno"; then
> -+ PKG_CHECK_MODULES(LCMS,
> -+ lcms2,
> -+ [have_lcms=yes],
> -+ [have_lcms=no])
> -+ if test "x$have_lcms" = "xno" -a "x$enable_lcms" = "xyes"; then
> -+ AC_MSG_ERROR([lcms support explicitly requested, but lcms couldn't be found])
> -+ fi
> -+ if test "x$have_lcms" = "xyes"; then
> -+ enable_lcms=yes
> -+ AC_DEFINE(HAVE_LCMS, 1, [Have lcms support])
> -+ fi
> - fi
> --AM_CONDITIONAL(HAVE_LCMS, [test "x$have_lcms" = xyes])
> -
> - AC_PATH_PROG([wayland_scanner], [wayland-scanner])
> - if test x$wayland_scanner = x; then
> diff --git a/meta/recipes-graphics/wayland/weston_1.9.0.bb b/meta/recipes-graphics/wayland/weston_1.10.0.bb
> similarity index 89%
> rename from meta/recipes-graphics/wayland/weston_1.9.0.bb
> rename to meta/recipes-graphics/wayland/weston_1.10.0.bb
> index 16a788d..3eccb1f 100644
> --- a/meta/recipes-graphics/wayland/weston_1.9.0.bb
> +++ b/meta/recipes-graphics/wayland/weston_1.10.0.bb
> @@ -5,24 +5,22 @@ LICENSE = "MIT"
> LIC_FILES_CHKSUM = "file://COPYING;md5=d79ee9e66bb0f95d3386a7acae780b70 \
> file://src/compositor.c;endline=23;md5=1d535fed266cf39f6d8c0647f52ac331"
>
> -SRC_URI = "http://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \
> +SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \
> file://weston.png \
> file://weston.desktop \
> - file://make-lcms-explicitly-configurable.patch \
> file://make-libwebp-explicitly-configurable.patch \
> file://0001-make-error-portable.patch \
> - file://libsystemd.patch \
> - file://explicit-enable-disable-systemd.patch \
> + file://0001-configure.ac-Fix-wayland-protocols-path.patch \
> "
> -SRC_URI[md5sum] = "66bbba12f546570b4d97f676bc79a28e"
> -SRC_URI[sha256sum] = "9c1b03f3184fa0b0dfdf67e215048085156e1a2ca344af6613fed36794ac48cf"
> +SRC_URI[md5sum] = "1cd17c54ecac6d9a3cd90bf12eaa3e20"
> +SRC_URI[sha256sum] = "e0b2004d00d8293ddf7903ca283c1746afa9ccb5919ab50fd04397ff472aa5c1"
>
> inherit autotools pkgconfig useradd distro_features_check
> # depends on virtual/egl
> REQUIRED_DISTRO_FEATURES = "opengl"
>
> DEPENDS = "libxkbcommon gdk-pixbuf pixman cairo glib-2.0 jpeg"
> -DEPENDS += "wayland libinput virtual/egl pango wayland-native"
> +DEPENDS += "wayland wayland-protocols libinput virtual/egl pango wayland-native"
>
> EXTRA_OECONF = "--enable-setuid-install \
> --enable-simple-clients \
> @@ -30,6 +28,7 @@ EXTRA_OECONF = "--enable-setuid-install \
> --enable-demo-clients-install \
> --disable-rpi-compositor \
> --disable-rdp-compositor \
> + WAYLAND_PROTOCOLS_SYSROOT_DIR=${STAGING_DIR}/${MACHINE} \
> "
>
> EXTRA_OECONF_append_qemux86 = "\
> @@ -98,6 +97,7 @@ FILES_${PN}-examples = "${bindir}/*"
>
> RDEPENDS_${PN} += "xkeyboard-config"
> RRECOMMENDS_${PN} = "liberation-fonts"
> +RRECOMMENDS_${PN}-dev += "wayland-protocols"
>
> USERADD_PACKAGES = "${PN}"
> GROUPADD_PARAM_${PN} = "--system weston-launch"
> --
> 2.1.4
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
^ permalink raw reply [flat|nested] 20+ messages in thread