* [PATCH 1/4] harfbuzz: upgrade to 1.7.4
@ 2018-01-02 12:41 Maxin B. John
2018-01-02 12:41 ` [PATCH 2/4] libatomic-ops: upgrade to 7.6.2 Maxin B. John
` (2 more replies)
0 siblings, 3 replies; 9+ messages in thread
From: Maxin B. John @ 2018-01-02 12:41 UTC (permalink / raw)
To: openembedded-core
1.7.0 -> 1.7.4
Signed-off-by: Maxin B. John <maxin.john@intel.com>
---
.../harfbuzz/{harfbuzz_1.7.0.bb => harfbuzz_1.7.4.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-graphics/harfbuzz/{harfbuzz_1.7.0.bb => harfbuzz_1.7.4.bb} (88%)
diff --git a/meta/recipes-graphics/harfbuzz/harfbuzz_1.7.0.bb b/meta/recipes-graphics/harfbuzz/harfbuzz_1.7.4.bb
similarity index 88%
rename from meta/recipes-graphics/harfbuzz/harfbuzz_1.7.0.bb
rename to meta/recipes-graphics/harfbuzz/harfbuzz_1.7.4.bb
index c45ec84..ce1ead4 100644
--- a/meta/recipes-graphics/harfbuzz/harfbuzz_1.7.0.bb
+++ b/meta/recipes-graphics/harfbuzz/harfbuzz_1.7.4.bb
@@ -12,8 +12,8 @@ DEPENDS = "glib-2.0 cairo fontconfig freetype"
SRC_URI = "http://www.freedesktop.org/software/harfbuzz/release/${BP}.tar.bz2"
-SRC_URI[md5sum] = "7e70e68ade0ed79719932b38c2130f0a"
-SRC_URI[sha256sum] = "042742d6ec67bc6719b69cf38a3fba24fbd120e207e3fdc18530dc730fb6a029"
+SRC_URI[md5sum] = "c7476d8b989869d8b95b37fa53add6bf"
+SRC_URI[sha256sum] = "b5d6ac8415f97f3540d73f3f91c41c5c10f8a4d76350f11a7184062aae88ac0b"
inherit autotools pkgconfig lib_package gtk-doc
--
2.4.0
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH 2/4] libatomic-ops: upgrade to 7.6.2 2018-01-02 12:41 [PATCH 1/4] harfbuzz: upgrade to 1.7.4 Maxin B. John @ 2018-01-02 12:41 ` Maxin B. John 2018-01-02 12:42 ` Alexander Kanavin 2018-01-02 12:41 ` [PATCH 3/4] libjpeg-turbo: upgrade to 1.5.3 Maxin B. John 2018-01-02 12:41 ` [PATCH 4/4] pkgconf: upgrade to 1.3.90 Maxin B. John 2 siblings, 1 reply; 9+ messages in thread From: Maxin B. John @ 2018-01-02 12:41 UTC (permalink / raw) To: openembedded-core 7.6.0 -> 7.6.2 Remove unused patch: 0001-Add-initial-nios2-architecture-support.patch Signed-off-by: Maxin B. John <maxin.john@intel.com> --- ...01-Add-initial-nios2-architecture-support.patch | 70 ---------------------- ...batomic-ops_7.6.0.bb => libatomic-ops_7.6.2.bb} | 6 +- 2 files changed, 4 insertions(+), 72 deletions(-) delete mode 100644 meta/recipes-support/libatomic-ops/libatomic-ops/0001-Add-initial-nios2-architecture-support.patch rename meta/recipes-support/libatomic-ops/{libatomic-ops_7.6.0.bb => libatomic-ops_7.6.2.bb} (68%) diff --git a/meta/recipes-support/libatomic-ops/libatomic-ops/0001-Add-initial-nios2-architecture-support.patch b/meta/recipes-support/libatomic-ops/libatomic-ops/0001-Add-initial-nios2-architecture-support.patch deleted file mode 100644 index c051075..0000000 --- a/meta/recipes-support/libatomic-ops/libatomic-ops/0001-Add-initial-nios2-architecture-support.patch +++ /dev/null @@ -1,70 +0,0 @@ -From 4b005ee56898309e8afba9b3c48cf94f0f5f78e4 Mon Sep 17 00:00:00 2001 -From: Marek Vasut <marex@denx.de> -Date: Tue, 15 Mar 2016 10:09:26 +0300 -Subject: [PATCH] Add initial nios2 architecture support - -* src/Makefile.am (nobase_private_HEADERS): Add nios2.h. -* src/atomic_ops.h: Include nios2.h if __nios2__. -* src/atomic_ops/sysdeps/gcc/nios2.h: New file. - -Signed-off-by: Marek Vasut <marex@denx.de> -Upstream-Status: Backport [ https://github.com/ivmai/libatomic_ops.git 4b005ee56898309e8afba9b3c48cf94f0f5f78e4 ] ---- - src/Makefile.am | 1 + - src/atomic_ops.h | 3 +++ - src/atomic_ops/sysdeps/gcc/nios2.h | 17 +++++++++++++++++ - 3 files changed, 21 insertions(+) - create mode 100644 src/atomic_ops/sysdeps/gcc/nios2.h - -diff --git a/src/Makefile.am b/src/Makefile.am -index fc09b27..d463427 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -79,6 +79,7 @@ nobase_private_HEADERS = atomic_ops/ao_version.h \ - atomic_ops/sysdeps/gcc/ia64.h \ - atomic_ops/sysdeps/gcc/m68k.h \ - atomic_ops/sysdeps/gcc/mips.h \ -+ atomic_ops/sysdeps/gcc/nios2.h \ - atomic_ops/sysdeps/gcc/powerpc.h \ - atomic_ops/sysdeps/gcc/s390.h \ - atomic_ops/sysdeps/gcc/sh.h \ -diff --git a/src/atomic_ops.h b/src/atomic_ops.h -index 33fe00e..ec02ba4 100644 ---- a/src/atomic_ops.h -+++ b/src/atomic_ops.h -@@ -262,6 +262,9 @@ - # if defined(__m68k__) - # include "atomic_ops/sysdeps/gcc/m68k.h" - # endif /* __m68k__ */ -+# if defined(__nios2__) -+# include "atomic_ops/sysdeps/gcc/nios2.h" -+# endif /* __nios2__ */ - # if defined(__powerpc__) || defined(__ppc__) || defined(__PPC__) \ - || defined(__powerpc64__) || defined(__ppc64__) - # include "atomic_ops/sysdeps/gcc/powerpc.h" -diff --git a/src/atomic_ops/sysdeps/gcc/nios2.h b/src/atomic_ops/sysdeps/gcc/nios2.h -new file mode 100644 -index 0000000..f402cbb ---- /dev/null -+++ b/src/atomic_ops/sysdeps/gcc/nios2.h -@@ -0,0 +1,17 @@ -+/* -+ * Copyright (C) 2016 Marek Vasut <marex@denx.de> -+ * -+ * THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED -+ * OR IMPLIED. ANY USE IS AT YOUR OWN RISK. -+ * -+ * Permission is hereby granted to use or copy this program -+ * for any purpose, provided the above notices are retained on all copies. -+ * Permission to modify the code and to distribute modified code is granted, -+ * provided the above notices are retained, and a notice that the code was -+ * modified is included with the above copyright notice. -+ */ -+ -+#include "../test_and_set_t_is_ao_t.h" -+#include "generic.h" -+ -+#define AO_T_IS_INT --- -2.7.0 - diff --git a/meta/recipes-support/libatomic-ops/libatomic-ops_7.6.0.bb b/meta/recipes-support/libatomic-ops/libatomic-ops_7.6.2.bb similarity index 68% rename from meta/recipes-support/libatomic-ops/libatomic-ops_7.6.0.bb rename to meta/recipes-support/libatomic-ops/libatomic-ops_7.6.2.bb index 4463d86..fff8fe2 100644 --- a/meta/recipes-support/libatomic-ops/libatomic-ops_7.6.0.bb +++ b/meta/recipes-support/libatomic-ops/libatomic-ops_7.6.2.bb @@ -7,9 +7,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ file://doc/LICENSING.txt;md5=e00dd5c8ac03a14c5ae5225a4525fa2d \ " PV .= "+git${SRCPV}" +SRCBRANCH ?= "release-7_6" +UPSTREAM_CHECK_URI = "https://github.com/ivmai/libatomic_ops/releases/" -SRCREV = "73c60c5ef1ed370111549ee5aab6d4020ba70ed4" -SRC_URI = "git://github.com/ivmai/libatomic_ops" +SRCREV = "5ae4b4aeea2baf13752d07e3038c47f70f06dcac" +SRC_URI = "git://github.com/ivmai/libatomic_ops;branch=${SRCBRANCH}" S = "${WORKDIR}/git" -- 2.4.0 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH 2/4] libatomic-ops: upgrade to 7.6.2 2018-01-02 12:41 ` [PATCH 2/4] libatomic-ops: upgrade to 7.6.2 Maxin B. John @ 2018-01-02 12:42 ` Alexander Kanavin 2018-01-02 12:57 ` Maxin B. John 0 siblings, 1 reply; 9+ messages in thread From: Alexander Kanavin @ 2018-01-02 12:42 UTC (permalink / raw) To: Maxin B. John, openembedded-core On 01/02/2018 02:41 PM, Maxin B. John wrote: > +UPSTREAM_CHECK_URI = "https://github.com/ivmai/libatomic_ops/releases/" > +SRC_URI = "git://github.com/ivmai/libatomic_ops;branch=${SRCBRANCH}" I don't think UPSTREAM_CHECK_URI has any effect when fetching from git, why was it added? Alex ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 2/4] libatomic-ops: upgrade to 7.6.2 2018-01-02 12:42 ` Alexander Kanavin @ 2018-01-02 12:57 ` Maxin B. John 0 siblings, 0 replies; 9+ messages in thread From: Maxin B. John @ 2018-01-02 12:57 UTC (permalink / raw) To: Alexander Kanavin; +Cc: openembedded-core Hi, On Tue, Jan 02, 2018 at 02:42:13PM +0200, Alexander Kanavin wrote: > On 01/02/2018 02:41 PM, Maxin B. John wrote: > >+UPSTREAM_CHECK_URI = "https://github.com/ivmai/libatomic_ops/releases/" > >+SRC_URI = "git://github.com/ivmai/libatomic_ops;branch=${SRCBRANCH}" > > I don't think UPSTREAM_CHECK_URI has any effect when fetching from git, why > was it added? It was added as there was a change in SRC_URI with branch info. Thanks for the review. I will remove that part. > Alex Best Regards, Maxin ^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH 3/4] libjpeg-turbo: upgrade to 1.5.3 2018-01-02 12:41 [PATCH 1/4] harfbuzz: upgrade to 1.7.4 Maxin B. John 2018-01-02 12:41 ` [PATCH 2/4] libatomic-ops: upgrade to 7.6.2 Maxin B. John @ 2018-01-02 12:41 ` Maxin B. John 2018-01-02 12:41 ` [PATCH 4/4] pkgconf: upgrade to 1.3.90 Maxin B. John 2 siblings, 0 replies; 9+ messages in thread From: Maxin B. John @ 2018-01-02 12:41 UTC (permalink / raw) To: openembedded-core 1.5.2 -> 1.5.3 No change in license. Updates in License Checksums are due to change in Copyright years. Signed-off-by: Maxin B. John <maxin.john@intel.com> --- .../jpeg/{libjpeg-turbo_1.5.2.bb => libjpeg-turbo_1.5.3.bb} | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) rename meta/recipes-graphics/jpeg/{libjpeg-turbo_1.5.2.bb => libjpeg-turbo_1.5.3.bb} (87%) diff --git a/meta/recipes-graphics/jpeg/libjpeg-turbo_1.5.2.bb b/meta/recipes-graphics/jpeg/libjpeg-turbo_1.5.3.bb similarity index 87% rename from meta/recipes-graphics/jpeg/libjpeg-turbo_1.5.2.bb rename to meta/recipes-graphics/jpeg/libjpeg-turbo_1.5.3.bb index 58646d3..8809f2c 100644 --- a/meta/recipes-graphics/jpeg/libjpeg-turbo_1.5.2.bb +++ b/meta/recipes-graphics/jpeg/libjpeg-turbo_1.5.3.bb @@ -3,17 +3,17 @@ DESCRIPTION = "libjpeg-turbo is a derivative of libjpeg that uses SIMD instructi HOMEPAGE = "http://libjpeg-turbo.org/" LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://cdjpeg.h;endline=13;md5=05bab7c7ad899d85bfba60da1a1271f2 \ +LIC_FILES_CHKSUM = "file://cdjpeg.h;endline=13;md5=8184bcc7c4ac7b9edc6a7bc00f231d0b \ file://jpeglib.h;endline=16;md5=f67d70e547a2662c079781c72f877f72 \ - file://djpeg.c;endline=11;md5=b90b6d2b4119f9e5807cd273f525d2af \ + file://djpeg.c;endline=11;md5=c59e19811c006cb38f82d6477134d314 \ " DEPENDS_append_x86-64_class-target = " nasm-native" DEPENDS_append_x86_class-target = " nasm-native" SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz" -SRC_URI[md5sum] = "6b4923e297a7eaa255f08511017a8818" -SRC_URI[sha256sum] = "9098943b270388727ae61de82adec73cf9f0dbb240b3bc8b172595ebf405b528" +SRC_URI[md5sum] = "7c82f0f6a3130ec06b8a4d0b321cbca3" +SRC_URI[sha256sum] = "b24890e2bb46e12e72a79f7e965f409f4e16466d00e1dd15d93d73ee6b592523" UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/libjpeg-turbo/files/" UPSTREAM_CHECK_REGEX = "/libjpeg-turbo/files/(?P<pver>(\d+[\.\-_]*)+)/" -- 2.4.0 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 4/4] pkgconf: upgrade to 1.3.90 2018-01-02 12:41 [PATCH 1/4] harfbuzz: upgrade to 1.7.4 Maxin B. John 2018-01-02 12:41 ` [PATCH 2/4] libatomic-ops: upgrade to 7.6.2 Maxin B. John 2018-01-02 12:41 ` [PATCH 3/4] libjpeg-turbo: upgrade to 1.5.3 Maxin B. John @ 2018-01-02 12:41 ` Maxin B. John 2018-01-02 12:38 ` Alexander Kanavin 2 siblings, 1 reply; 9+ messages in thread From: Maxin B. John @ 2018-01-02 12:41 UTC (permalink / raw) To: openembedded-core 1.3.7 -> 1.3.90 Removed following upstreamed and backported patches: 1. 0001-stdinc.h-fix-build-with-mingw.patch 2. 0001-Minimal-tweaks-to-compile-with-Visual-C-2015.patch Signed-off-by: Maxin B. John <maxin.john@intel.com> --- ...imal-tweaks-to-compile-with-Visual-C-2015.patch | 224 --------------------- .../0001-stdinc.h-fix-build-with-mingw.patch | 48 ----- .../{pkgconf_1.3.7.bb => pkgconf_1.3.90.bb} | 6 +- 3 files changed, 2 insertions(+), 276 deletions(-) delete mode 100644 meta/recipes-devtools/pkgconf/pkgconf/0001-Minimal-tweaks-to-compile-with-Visual-C-2015.patch delete mode 100644 meta/recipes-devtools/pkgconf/pkgconf/0001-stdinc.h-fix-build-with-mingw.patch rename meta/recipes-devtools/pkgconf/{pkgconf_1.3.7.bb => pkgconf_1.3.90.bb} (91%) diff --git a/meta/recipes-devtools/pkgconf/pkgconf/0001-Minimal-tweaks-to-compile-with-Visual-C-2015.patch b/meta/recipes-devtools/pkgconf/pkgconf/0001-Minimal-tweaks-to-compile-with-Visual-C-2015.patch deleted file mode 100644 index 3805ad3..0000000 --- a/meta/recipes-devtools/pkgconf/pkgconf/0001-Minimal-tweaks-to-compile-with-Visual-C-2015.patch +++ /dev/null @@ -1,224 +0,0 @@ -From 4d7b4d7c8e9966c593f472355607204c6c80fecb Mon Sep 17 00:00:00 2001 -From: Dan Kegel <dank@kegel.com> -Date: Sun, 4 Jun 2017 19:19:55 -0700 -Subject: [PATCH] Minimal tweaks to compile with Visual C 2015 - -Upstream-Status: Backport - -Signed-off-by: Maxin B. John <maxin.john@intel.com> ---- - getopt_long.c | 2 ++ - libpkgconf/bsdstubs.c | 1 + - libpkgconf/libpkgconf.h | 2 +- - libpkgconf/path.c | 10 +++++----- - libpkgconf/pkg.c | 28 +++++++++++++++++++--------- - libpkgconf/stdinc.h | 9 +++++++-- - 6 files changed, 35 insertions(+), 17 deletions(-) - -diff --git a/getopt_long.c b/getopt_long.c -index afeb68d..5ce9bfd 100644 ---- a/getopt_long.c -+++ b/getopt_long.c -@@ -62,7 +62,9 @@ - #include <stdio.h> - #include <stdlib.h> - #include <string.h> -+#ifndef _WIN32 - #include <unistd.h> -+#endif - - #define PKGCONF_HACK_LOGICAL_OR_ALL_VALUES - -diff --git a/libpkgconf/bsdstubs.c b/libpkgconf/bsdstubs.c -index 8f70ff3..2c000ac 100644 ---- a/libpkgconf/bsdstubs.c -+++ b/libpkgconf/bsdstubs.c -@@ -17,6 +17,7 @@ - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ - -+#include <stdlib.h> - #include <sys/types.h> - #include <string.h> - -diff --git a/libpkgconf/libpkgconf.h b/libpkgconf/libpkgconf.h -index 404bf0c..551d85d 100644 ---- a/libpkgconf/libpkgconf.h -+++ b/libpkgconf/libpkgconf.h -@@ -310,7 +310,7 @@ void pkgconf_audit_log_dependency(pkgconf_client_t *client, const pkgconf_pkg_t - /* path.c */ - void pkgconf_path_add(const char *text, pkgconf_list_t *dirlist, bool filter); - size_t pkgconf_path_split(const char *text, pkgconf_list_t *dirlist, bool filter); --size_t pkgconf_path_build_from_environ(const char *environ, const char *fallback, pkgconf_list_t *dirlist, bool filter); -+size_t pkgconf_path_build_from_environ(const char *envvarname, const char *fallback, pkgconf_list_t *dirlist, bool filter); - bool pkgconf_path_match_list(const char *path, const pkgconf_list_t *dirlist); - void pkgconf_path_free(pkgconf_list_t *dirlist); - bool pkgconf_path_relocate(char *buf, size_t buflen); -diff --git a/libpkgconf/path.c b/libpkgconf/path.c -index dddb3bf..59e003e 100644 ---- a/libpkgconf/path.c -+++ b/libpkgconf/path.c -@@ -20,7 +20,7 @@ - # include <sys/cygwin.h> - #endif - --#ifdef HAVE_SYS_STAT_H -+#if defined(HAVE_SYS_STAT_H) && ! defined(_WIN32) - # include <sys/stat.h> - # define PKGCONF_CACHE_INODES - #endif -@@ -156,12 +156,12 @@ pkgconf_path_split(const char *text, pkgconf_list_t *dirlist, bool filter) - /* - * !doc - * -- * .. c:function:: size_t pkgconf_path_build_from_environ(const char *environ, const char *fallback, pkgconf_list_t *dirlist) -+ * .. c:function:: size_t pkgconf_path_build_from_environ(const char *envvarname, const char *fallback, pkgconf_list_t *dirlist) - * - * Adds the paths specified in an environment variable to a path list. If the environment variable is not set, - * an optional default set of paths is added. - * -- * :param char* environ: The environment variable to look up. -+ * :param char* envvarname: The environment variable to look up. - * :param char* fallback: The fallback paths to use if the environment variable is not set. - * :param pkgconf_list_t* dirlist: The path list to add the path nodes to. - * :param bool filter: Whether to perform duplicate filtering. -@@ -169,11 +169,11 @@ pkgconf_path_split(const char *text, pkgconf_list_t *dirlist, bool filter) - * :rtype: size_t - */ - size_t --pkgconf_path_build_from_environ(const char *environ, const char *fallback, pkgconf_list_t *dirlist, bool filter) -+pkgconf_path_build_from_environ(const char *envvarname, const char *fallback, pkgconf_list_t *dirlist, bool filter) - { - const char *data; - -- data = getenv(environ); -+ data = getenv(envvarname); - if (data != NULL) - return pkgconf_path_split(data, dirlist, filter); - -diff --git a/libpkgconf/pkg.c b/libpkgconf/pkg.c -index 7aebd61..5dacae3 100644 ---- a/libpkgconf/pkg.c -+++ b/libpkgconf/pkg.c -@@ -30,6 +30,8 @@ - # define PKG_CONFIG_REG_KEY "Software\\pkgconfig\\PKG_CONFIG_PATH" - # undef PKG_DEFAULT_PATH - # define PKG_DEFAULT_PATH "../lib/pkgconfig;../share/pkgconfig" -+#define strncasecmp _strnicmp -+#define strcasecmp _stricmp - #endif - - #define PKG_CONFIG_EXT ".pc" -@@ -134,21 +136,21 @@ static int pkgconf_pkg_parser_keyword_pair_cmp(const void *key, const void *ptr) - static void - pkgconf_pkg_parser_tuple_func(const pkgconf_client_t *client, pkgconf_pkg_t *pkg, const ptrdiff_t offset, char *value) - { -- char **dest = ((void *) pkg + offset); -+ char **dest = (char **)((char *) pkg + offset); - *dest = pkgconf_tuple_parse(client, &pkg->vars, value); - } - - static void - pkgconf_pkg_parser_fragment_func(const pkgconf_client_t *client, pkgconf_pkg_t *pkg, const ptrdiff_t offset, char *value) - { -- pkgconf_list_t *dest = ((void *) pkg + offset); -+ pkgconf_list_t *dest = (pkgconf_list_t *)((char *) pkg + offset); - pkgconf_fragment_parse(client, dest, &pkg->vars, value); - } - - static void - pkgconf_pkg_parser_dependency_func(const pkgconf_client_t *client, pkgconf_pkg_t *pkg, const ptrdiff_t offset, char *value) - { -- pkgconf_list_t *dest = ((void *) pkg + offset); -+ pkgconf_list_t *dest = (pkgconf_list_t *)((char *) pkg + offset); - pkgconf_dependency_parse(client, pkg, dest, value); - } - -@@ -238,7 +240,7 @@ pkgconf_pkg_validate(const pkgconf_client_t *client, const pkgconf_pkg_t *pkg) - - for (i = 0; i < PKGCONF_ARRAY_SIZE(pkgconf_pkg_validations); i++) - { -- char **p = ((void *) pkg + pkgconf_pkg_validations[i].offset); -+ char **p = (char **)((char *) pkg + pkgconf_pkg_validations[i].offset); - - if (*p != NULL) - continue; -@@ -587,7 +589,7 @@ pkgconf_scan_all(pkgconf_client_t *client, void *data, pkgconf_pkg_iteration_fun - - #ifdef _WIN32 - static pkgconf_pkg_t * --pkgconf_pkg_find_in_registry_key(const pkgconf_client_t *client, HKEY hkey, const char *name) -+pkgconf_pkg_find_in_registry_key(pkgconf_client_t *client, HKEY hkey, const char *name) - { - pkgconf_pkg_t *pkg = NULL; - -@@ -1048,8 +1050,12 @@ typedef struct { - - static const pkgconf_pkg_provides_vermatch_rule_t pkgconf_pkg_provides_vermatch_rules[] = { - [PKGCONF_CMP_ANY] = { -- .rulecmp = {}, -- .depcmp = {}, -+ .rulecmp = { -+ [PKGCONF_CMP_ANY] = pkgconf_pkg_comparator_none, -+ }, -+ .depcmp = { -+ [PKGCONF_CMP_ANY] = pkgconf_pkg_comparator_none, -+ }, - }, - [PKGCONF_CMP_LESS_THAN] = { - .rulecmp = { -@@ -1121,7 +1127,9 @@ static const pkgconf_pkg_provides_vermatch_rule_t pkgconf_pkg_provides_vermatch_ - [PKGCONF_CMP_EQUAL] = pkgconf_pkg_comparator_eq, - [PKGCONF_CMP_NOT_EQUAL] = pkgconf_pkg_comparator_ne - }, -- .depcmp = {}, -+ .depcmp = { -+ [PKGCONF_CMP_ANY] = pkgconf_pkg_comparator_none, -+ }, - }, - [PKGCONF_CMP_NOT_EQUAL] = { - .rulecmp = { -@@ -1133,7 +1141,9 @@ static const pkgconf_pkg_provides_vermatch_rule_t pkgconf_pkg_provides_vermatch_ - [PKGCONF_CMP_EQUAL] = pkgconf_pkg_comparator_ne, - [PKGCONF_CMP_NOT_EQUAL] = pkgconf_pkg_comparator_eq - }, -- .depcmp = {}, -+ .depcmp = { -+ [PKGCONF_CMP_ANY] = pkgconf_pkg_comparator_none, -+ }, - }, - }; - -diff --git a/libpkgconf/stdinc.h b/libpkgconf/stdinc.h -index 58cc6c7..ac7e53c 100644 ---- a/libpkgconf/stdinc.h -+++ b/libpkgconf/stdinc.h -@@ -24,9 +24,7 @@ - #include <stdbool.h> - #include <stdarg.h> - #include <string.h> --#include <dirent.h> - #include <sys/types.h> --#include <unistd.h> - #include <stdint.h> - - #ifdef _WIN32 -@@ -34,8 +32,15 @@ - # include <windows.h> - # include <malloc.h> - # define PATH_DEV_NULL "nul" -+# ifndef ssize_t -+# include <BaseTsd.h> -+# define ssize_t SSIZE_T -+# endif -+# include "win-dirent.h" - #else - # define PATH_DEV_NULL "/dev/null" -+# include <dirent.h> -+# include <unistd.h> - #endif - - #endif --- -2.4.0 - diff --git a/meta/recipes-devtools/pkgconf/pkgconf/0001-stdinc.h-fix-build-with-mingw.patch b/meta/recipes-devtools/pkgconf/pkgconf/0001-stdinc.h-fix-build-with-mingw.patch deleted file mode 100644 index 49ebe31..0000000 --- a/meta/recipes-devtools/pkgconf/pkgconf/0001-stdinc.h-fix-build-with-mingw.patch +++ /dev/null @@ -1,48 +0,0 @@ -From ea28c5b34457cf7676181b284e22ea5f79a30d85 Mon Sep 17 00:00:00 2001 -From: "Maxin B. John" <maxin.john@intel.com> -Date: Thu, 13 Jul 2017 14:47:31 +0300 -Subject: [PATCH] stdinc.h: fix build with mingw - -Fixes this build error with mingw: -... -| compilation terminated. -| In file included from ../pkgconf-1.3.7/libpkgconf/libpkgconf.h:19:0, -| from ../pkgconf-1.3.7/libpkgconf/audit.c:16: -| ../pkgconf-1.3.7/libpkgconf/stdinc.h:36:12: fatal error: BaseTsd.h: No -such file or directory -| # include <BaseTsd.h> - -Upstream-Status: Submitted - -Signed-off-by: Maxin B. John <maxin.john@intel.com> ---- - libpkgconf/stdinc.h | 10 +++++++++- - 1 file changed, 9 insertions(+), 1 deletion(-) - -diff --git a/libpkgconf/stdinc.h b/libpkgconf/stdinc.h -index ac7e53c..d8efcf5 100644 ---- a/libpkgconf/stdinc.h -+++ b/libpkgconf/stdinc.h -@@ -33,10 +33,18 @@ - # include <malloc.h> - # define PATH_DEV_NULL "nul" - # ifndef ssize_t -+# ifndef __MINGW32__ - # include <BaseTsd.h> -+# else -+# include <basetsd.h> -+# endif - # define ssize_t SSIZE_T - # endif --# include "win-dirent.h" -+# ifndef __MINGW32__ -+# include "win-dirent.h" -+# else -+# include <dirent.h> -+# endif - #else - # define PATH_DEV_NULL "/dev/null" - # include <dirent.h> --- -2.4.0 - diff --git a/meta/recipes-devtools/pkgconf/pkgconf_1.3.7.bb b/meta/recipes-devtools/pkgconf/pkgconf_1.3.90.bb similarity index 91% rename from meta/recipes-devtools/pkgconf/pkgconf_1.3.7.bb rename to meta/recipes-devtools/pkgconf/pkgconf_1.3.90.bb index 5da0dd1..a521932 100644 --- a/meta/recipes-devtools/pkgconf/pkgconf_1.3.7.bb +++ b/meta/recipes-devtools/pkgconf/pkgconf_1.3.90.bb @@ -17,14 +17,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=548a9d1db10cc0a84810c313a0e9266f" SRC_URI = "\ https://distfiles.dereferenced.org/pkgconf/pkgconf-${PV}.tar.xz \ - file://0001-Minimal-tweaks-to-compile-with-Visual-C-2015.patch \ - file://0001-stdinc.h-fix-build-with-mingw.patch \ file://pkg-config-wrapper \ file://pkg-config-native.in \ file://pkg-config-esdk.in \ " -SRC_URI[md5sum] = "ac35c34d84eeb6a03d4d61b8555d6197" -SRC_URI[sha256sum] = "1be7e40900c7467893c65f810211b1e68da3f8d5e70fddb883fc24839cad0339" +SRC_URI[md5sum] = "d15186f3a688391a8c3a555f128e4db6" +SRC_URI[sha256sum] = "112db7f957816901b5fe448715c0a9e38f171d4794c44075b0734a0e7fcfba36" inherit autotools update-alternatives -- 2.4.0 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH 4/4] pkgconf: upgrade to 1.3.90 2018-01-02 12:41 ` [PATCH 4/4] pkgconf: upgrade to 1.3.90 Maxin B. John @ 2018-01-02 12:38 ` Alexander Kanavin 2018-01-02 12:52 ` Maxin B. John 0 siblings, 1 reply; 9+ messages in thread From: Alexander Kanavin @ 2018-01-02 12:38 UTC (permalink / raw) To: Maxin B. John, openembedded-core On 01/02/2018 02:41 PM, Maxin B. John wrote: > 1.3.7 -> 1.3.90 1.3.90 is a pre-release tag for 1.4.0, can be seen here: https://github.com/pkgconf/pkgconf/blob/master/NEWS Alex ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 4/4] pkgconf: upgrade to 1.3.90 2018-01-02 12:38 ` Alexander Kanavin @ 2018-01-02 12:52 ` Maxin B. John 2018-01-02 12:47 ` Alexander Kanavin 0 siblings, 1 reply; 9+ messages in thread From: Maxin B. John @ 2018-01-02 12:52 UTC (permalink / raw) To: Alexander Kanavin; +Cc: openembedded-core Hi Alex, On Tue, Jan 02, 2018 at 02:38:54PM +0200, Alexander Kanavin wrote: > On 01/02/2018 02:41 PM, Maxin B. John wrote: > >1.3.7 -> 1.3.90 > > 1.3.90 is a pre-release tag for 1.4.0, can be seen here: > > https://github.com/pkgconf/pkgconf/blob/master/NEWS Thanks. In that case, we can wait till they officially release 1.4.0. > Alex Best Regards, Maxin ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 4/4] pkgconf: upgrade to 1.3.90 2018-01-02 12:52 ` Maxin B. John @ 2018-01-02 12:47 ` Alexander Kanavin 0 siblings, 0 replies; 9+ messages in thread From: Alexander Kanavin @ 2018-01-02 12:47 UTC (permalink / raw) To: Maxin B. John; +Cc: openembedded-core On 01/02/2018 02:52 PM, Maxin B. John wrote: > Hi Alex, > > On Tue, Jan 02, 2018 at 02:38:54PM +0200, Alexander Kanavin wrote: >> On 01/02/2018 02:41 PM, Maxin B. John wrote: >>> 1.3.7 -> 1.3.90 >> >> 1.3.90 is a pre-release tag for 1.4.0, can be seen here: >> >> https://github.com/pkgconf/pkgconf/blob/master/NEWS > > Thanks. In that case, we can wait till they officially release 1.4.0. You can practice your regex skills meanwhile, and exclude tags that have 9<other-digits> in the minor version part. Alex ^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2018-01-02 12:55 UTC | newest] Thread overview: 9+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2018-01-02 12:41 [PATCH 1/4] harfbuzz: upgrade to 1.7.4 Maxin B. John 2018-01-02 12:41 ` [PATCH 2/4] libatomic-ops: upgrade to 7.6.2 Maxin B. John 2018-01-02 12:42 ` Alexander Kanavin 2018-01-02 12:57 ` Maxin B. John 2018-01-02 12:41 ` [PATCH 3/4] libjpeg-turbo: upgrade to 1.5.3 Maxin B. John 2018-01-02 12:41 ` [PATCH 4/4] pkgconf: upgrade to 1.3.90 Maxin B. John 2018-01-02 12:38 ` Alexander Kanavin 2018-01-02 12:52 ` Maxin B. John 2018-01-02 12:47 ` Alexander Kanavin
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.