* [PATCH 1/7] fltk: upgrade 1.3.5 -> 1.3.6
@ 2021-05-23 22:33 Andreas Müller
2021-05-23 22:33 ` [PATCH 2/7] botan: upgrade 2.14.0 -> 2.18.1 Andreas Müller
` (5 more replies)
0 siblings, 6 replies; 8+ messages in thread
From: Andreas Müller @ 2021-05-23 22:33 UTC (permalink / raw)
To: openembedded-devel
* DOPTION_BUILD_EXAMPLES was deprecated in favor of FLTK_BUILD_TEST
* FLTK_BUILD_TEST fails for native due to reduced build
* FLTK_BUILD_TEST fails for cross due ti trying to run cross fluid
* Patches: 0002.. adjust / 0003.. upstream has acknowledged it a bad ides so
change was commented out / 0004.. upstreamed
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
meta-oe/recipes-support/fltk/fltk-native.bb | 5 +-
meta-oe/recipes-support/fltk/fltk.bb | 7 +-
meta-oe/recipes-support/fltk/fltk.inc | 5 +-
...ways-build-fluid-and-export-pointers.patch | 24 +--
...ce-shared-libs-with-unsuffixed-names.patch | 41 ----
...-when-enable-package-config-examples.patch | 182 ------------------
6 files changed, 19 insertions(+), 245 deletions(-)
delete mode 100644 meta-oe/recipes-support/fltk/fltk/0003-CMake-build-Force-shared-libs-with-unsuffixed-names.patch
delete mode 100644 meta-oe/recipes-support/fltk/fltk/0004-Fix-build-error-when-enable-package-config-examples.patch
diff --git a/meta-oe/recipes-support/fltk/fltk-native.bb b/meta-oe/recipes-support/fltk/fltk-native.bb
index 2636287e3..5d5a236be 100644
--- a/meta-oe/recipes-support/fltk/fltk-native.bb
+++ b/meta-oe/recipes-support/fltk/fltk-native.bb
@@ -9,12 +9,15 @@ EXTRA_OECMAKE += " \
-DOPTION_USE_THREADS=OFF \
-DOPTION_USE_XDBE=OFF \
-DOPTION_USE_XFT=OFF \
- -DOPTION_BUILD_EXAMPLES=OFF \
+ -DFLTK_BUILD_TEST=OFF \
-DOPTION_USE_XINERAMA=OFF \
-DOPTION_USE_XFIXES=OFF \
-DOPTION_USE_XCURSOR=OFF \
"
+# lib/libfltk.a(Fl_Native_File_Chooser.cxx.o): undefined reference to symbol 'dlsym@@GLIBC_2.2.5'
+LDFLAGS += "-ldl"
+
do_install_append() {
# make sure native fltk-config is not used accidentaly
rm -f ${D}${bindir}/fltk-config
diff --git a/meta-oe/recipes-support/fltk/fltk.bb b/meta-oe/recipes-support/fltk/fltk.bb
index 09344cf7d..51b4a0bc8 100644
--- a/meta-oe/recipes-support/fltk/fltk.bb
+++ b/meta-oe/recipes-support/fltk/fltk.bb
@@ -5,14 +5,10 @@ DEPENDS = "alsa-lib zlib jpeg libpng libxext libxft"
inherit features_check binconfig lib_package gtk-icon-cache mime mime-xdg
REQUIRED_DISTRO_FEATURES = "x11"
-SRC_URI += " \
- file://0003-CMake-build-Force-shared-libs-with-unsuffixed-names.patch \
- file://0004-Fix-build-error-when-enable-package-config-examples.patch \
-"
-
EXTRA_OECMAKE = " \
-DOPTION_BUILD_SHARED_LIBS=ON \
-DOPTION_USE_THREADS=ON \
+ -DFLTK_BUILD_TEST=OFF \
-DOPTION_USE_XDBE=ON \
-DOPTION_USE_XFT=ON \
-DFLTK_CONFIG_PATH=${libdir}/cmake \
@@ -20,7 +16,6 @@ EXTRA_OECMAKE = " \
PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'opengl', d)}"
-PACKAGECONFIG[examples] = "-DOPTION_BUILD_EXAMPLES=ON,-DOPTION_BUILD_EXAMPLES=OFF,fltk-native"
PACKAGECONFIG[cairo] = "-DOPTION_CAIRO=ON,-DOPTION_CAIRO=OFF,cairo"
PACKAGECONFIG[opengl] = "-DOPTION_USE_GL=ON,-DOPTION_USE_GL=OFF,virtual/libgl"
PACKAGECONFIG[xinerama] = "-DOPTION_USE_XINERAMA=ON,-DOPTION_USE_XINERAMA=OFF,libxinerama"
diff --git a/meta-oe/recipes-support/fltk/fltk.inc b/meta-oe/recipes-support/fltk/fltk.inc
index 97a1fbfc7..403cbddbb 100644
--- a/meta-oe/recipes-support/fltk/fltk.inc
+++ b/meta-oe/recipes-support/fltk/fltk.inc
@@ -11,9 +11,8 @@ SRC_URI = " \
file://0002-always-build-fluid-and-export-pointers.patch \
"
-PV = "1.3.5"
-SRC_URI[md5sum] = "0de2b45a1896be2b4a8cafae89b84248"
-SRC_URI[sha256sum] = "2933c72400f9e7c0f4c3a81a1ce98bc9582b2a3edc44b8597ccd26e240e32c3c"
+PV = "1.3.6"
+SRC_URI[sha256sum] = "20d2627c97b4485ee3eab5522303985bc22b798a878ba80239e6d43dcfed067e"
inherit cmake pkgconfig
diff --git a/meta-oe/recipes-support/fltk/fltk/0002-always-build-fluid-and-export-pointers.patch b/meta-oe/recipes-support/fltk/fltk/0002-always-build-fluid-and-export-pointers.patch
index cca977c66..0d91aab3a 100644
--- a/meta-oe/recipes-support/fltk/fltk/0002-always-build-fluid-and-export-pointers.patch
+++ b/meta-oe/recipes-support/fltk/fltk/0002-always-build-fluid-and-export-pointers.patch
@@ -1,6 +1,6 @@
From 16010cb1a69ea2326d8102b7f1e34b65aca4b278 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
-Date: Tue, 28 Feb 2017 01:20:42 +0100
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
+Date: Sat, 22 May 2021 12:33:15 +0200
Subject: [PATCH] always build fluid and export pointers
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
@@ -8,24 +8,24 @@ Content-Transfer-Encoding: 8bit
Upstream-Status: Inappropriate [embedded specific]
-Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
+Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
CMake/export.cmake | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/CMake/export.cmake b/CMake/export.cmake
-index 968186a..95e04eb 100644
+index 6e8bc5d..71b6f6c 100644
--- a/CMake/export.cmake
+++ b/CMake/export.cmake
-@@ -21,7 +21,7 @@
- # final config and export
+@@ -20,7 +20,7 @@
#######################################################################
+
# Set the fluid executable path
--if(CMAKE_CROSSCOMPILING)
-+if(FALSE)
- find_file(FLUID_PATH
- NAMES fluid fluid.exe
- PATHS ENV PATH
+-if (CMAKE_CROSSCOMPILING)
++if (FALSE)
+ find_file(FLUID_PATH
+ NAMES fluid fluid.exe
+ PATHS ENV PATH
--
-2.9.3
+2.31.1
diff --git a/meta-oe/recipes-support/fltk/fltk/0003-CMake-build-Force-shared-libs-with-unsuffixed-names.patch b/meta-oe/recipes-support/fltk/fltk/0003-CMake-build-Force-shared-libs-with-unsuffixed-names.patch
deleted file mode 100644
index 1f2f8aecf..000000000
--- a/meta-oe/recipes-support/fltk/fltk/0003-CMake-build-Force-shared-libs-with-unsuffixed-names.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From bc38fb41044503c9debf5710910c51dd29674b6a Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
-Date: Fri, 15 Dec 2017 22:14:01 +0100
-Subject: [PATCH] CMake build: Force shared libs with unsuffixed names
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-For windows build sake CMake complains when a project wants to build shared and
-static libraries with same name. This caused the authors of fltk to generate
-libraries with names suffixed by '_SHARED' when building fltk with cmake -
-autotools builds do not suffix.
-
-Reasons to build shared libs with correct names:
-
-* Shared libraries are the preferred choice for embedded devices
-* There are projects (e.g yoshimi) expecting shared libraries with unsuffixed
- names - as created by autotools build. These projects link against static
- libraries by accident causing unusable binaries.
-
-Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
----
- CMake/macros.cmake | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMake/macros.cmake b/CMake/macros.cmake
-index 4def62d..ab675f0 100644
---- a/CMake/macros.cmake
-+++ b/CMake/macros.cmake
-@@ -49,7 +49,7 @@ macro(FL_ADD_LIBRARY LIBNAME LIBTYPE LIBFILES)
- PROPERTIES
- VERSION ${FLTK_VERSION_FULL}
- SOVERSION ${FLTK_VERSION_MAJOR}.${FLTK_VERSION_MINOR}
-- PREFIX "lib" # for MSVC static/shared coexistence
-+ OUTPUT_NAME ${LIBNAME} CLEAN_DIRECT_OUTPUT 1
- )
- endif (${LIBTYPE} STREQUAL "SHARED")
-
---
-2.9.5
-
diff --git a/meta-oe/recipes-support/fltk/fltk/0004-Fix-build-error-when-enable-package-config-examples.patch b/meta-oe/recipes-support/fltk/fltk/0004-Fix-build-error-when-enable-package-config-examples.patch
deleted file mode 100644
index 974c02fe6..000000000
--- a/meta-oe/recipes-support/fltk/fltk/0004-Fix-build-error-when-enable-package-config-examples.patch
+++ /dev/null
@@ -1,182 +0,0 @@
-Fix build error when enable package config examples.
-
-Upstream-Status: Backport [https://github.com/fltk/fltk/commit/16774dd]
-
-Signed-off-by: Kai Kang <kai.kang@windriver.com>
-
-
-From 16774ddc4e000c89e560fde0ced8be9814ef041e Mon Sep 17 00:00:00 2001
-From: Albrecht Schlosser <albrechts.fltk@online.de>
-Date: Wed, 8 Feb 2017 02:06:52 +0000
-Subject: [PATCH] Rename test/help demo program to test/help_dialog.
-
-This change avoids a name conflict with CMake's auto-generated target 'help'
-for "Unix Makefiles", "Ninja", and supposedly other generators as well.
-
-
-git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12171 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
----
- CMake/macros.cmake | 5 -----
- documentation/src/examples.dox | 8 +++----
- test/CMakeLists.txt | 27 +++++++++++++++++++----
- test/demo.menu | 2 +-
- test/{help.cxx => help_dialog.cxx} | 6 ++---
- test/{help-test.html => help_dialog.html} | 0
- 6 files changed, 31 insertions(+), 17 deletions(-)
- rename test/{help.cxx => help_dialog.cxx} (88%)
- rename test/{help-test.html => help_dialog.html} (100%)
-
-diff --git a/CMake/macros.cmake b/CMake/macros.cmake
-index 5b0d0fa..7134fcb 100644
---- a/CMake/macros.cmake
-+++ b/CMake/macros.cmake
-@@ -90,11 +90,6 @@ function(CREATE_EXAMPLE NAME SOURCES LIBRARIES)
-
- set (tname ${NAME}) # target name
-
-- # rename reserved target name "help" (CMake 2.8.12 and later)
-- if (${tname} MATCHES "^help$")
-- set (tname "test_help")
-- endif (${tname} MATCHES "^help$")
--
- foreach(src ${SOURCES})
- if ("${src}" MATCHES "\\.fl$")
- list(APPEND flsrcs ${src})
-diff --git a/documentation/src/examples.dox b/documentation/src/examples.dox
-index 5105b7b..7961b02 100644
---- a/documentation/src/examples.dox
-+++ b/documentation/src/examples.dox
-@@ -60,7 +60,7 @@ you build FLTK, unlike those in the 'test' directory shown below.
- </tr>
- <tr>
- <td> \ref examples_hello </td>
--<td> \ref examples_help </td>
-+<td> \ref examples_help_dialog </td>
- <td> \ref examples_iconize </td>
- <td> \ref examples_image </td>
- <td> \ref examples_inactive </td>
-@@ -326,13 +326,13 @@ easily under FLTK.
- tiny demo shows how little is needed to get a functioning application
- running with FLTK. Quite impressive, I'd say.
-
--\subsection examples_help help
-+\subsection examples_help_dialog help_dialog
-
- \par
--\c help displays the built-in FLTK help browser. The
-+\c help_dialog displays the built-in FLTK help browser. The
- Fl_Help_Dialog understands a subset of html and renders
- various image formats. This widget makes it easy to provide help
--pages to the user without depending on the operating system's
-+pages to the user without depending on the operating system's
- html browser.
-
- \subsection examples_iconize iconize
-diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
-index 22ec9ab..4caffa5 100644
---- a/test/CMakeLists.txt
-+++ b/test/CMakeLists.txt
-@@ -1,3 +1,22 @@
-+#
-+# "$Id$"
-+#
-+# CMakeLists.txt used to build test and demo apps by the CMake build system
-+#
-+# Copyright 2004-2017 by Bill Spitzak and others.
-+#
-+# This library is free software. Distribution and use rights are outlined in
-+# the file "COPYING" which should have been included with this file. If this
-+# file is missing or damaged, see the license at:
-+#
-+# http://www.fltk.org/COPYING.php
-+#
-+# Please report all bugs and problems on the following page:
-+#
-+# http://www.fltk.org/str.php
-+#
-+#######################################################################
-+
- set(EXECUTABLE_OUTPUT_PATH ${FLTK_BINARY_DIR}/bin/examples)
-
- #######################################################################
-@@ -64,7 +83,7 @@ CREATE_EXAMPLE(file_chooser file_chooser.cxx "fltk;fltk_images")
- CREATE_EXAMPLE(fonts fonts.cxx fltk)
- CREATE_EXAMPLE(forms forms.cxx "fltk;fltk_forms")
- CREATE_EXAMPLE(hello hello.cxx fltk)
--CREATE_EXAMPLE(help help.cxx "fltk;fltk_images")
-+CREATE_EXAMPLE(help_dialog help_dialog.cxx "fltk;fltk_images")
- CREATE_EXAMPLE(icon icon.cxx fltk)
- CREATE_EXAMPLE(iconize iconize.cxx fltk)
- CREATE_EXAMPLE(image image.cxx fltk)
-@@ -134,7 +153,7 @@ endif(FLTK_HAVE_CAIRO)
- # Note: this is incomplete as of 11 Feb 2015
- # Todo: currently all files are copied, but some of them need configuration:
- # - demo.menu: fluid can't be started (wrong path)
--# - demo.menu: help (help-test.html) can't find its images (not copied)
-+# - demo.menu: help_dialog (help_dialog.html) can't find its images (not copied)
- # - maybe more ...
-
- # prepare for a "better" test file installation path
-@@ -149,11 +168,11 @@ configure_file(demo.menu ${TESTFILE_PATH}/demo.menu COPYONLY)
-
- # use target directory only to avoid redundancy
- configure_file(rgb.txt ${TESTFILE_PATH} COPYONLY)
--configure_file(help-test.html ${TESTFILE_PATH} COPYONLY)
-+configure_file(help_dialog.html ${TESTFILE_PATH} COPYONLY)
- configure_file(browser.cxx ${TESTFILE_PATH} COPYONLY)
- configure_file(editor.cxx ${TESTFILE_PATH} COPYONLY)
- if(APPLE AND NOT OPTION_APPLE_X11)
- configure_file(browser.cxx "${TESTFILE_PATH}/browser.app/Contents/Resources/browser.cxx" COPYONLY)
- configure_file(rgb.txt ${TESTFILE_PATH}/colbrowser.app/Contents/Resources/rgb.txt COPYONLY)
-- configure_file(help-test.html ${TESTFILE_PATH}/help.app/Contents/Resources/help-test.html COPYONLY)
-+ configure_file(help_dialog.html ${TESTFILE_PATH}/help_dialog.app/Contents/Resources/help_dialog.html COPYONLY)
- endif(APPLE AND NOT OPTION_APPLE_X11)
-diff --git a/test/demo.menu b/test/demo.menu
-index 337a71c..97e522a 100644
---- a/test/demo.menu
-+++ b/test/demo.menu
-@@ -77,7 +77,7 @@
- @o:Font Tests...:@of
- @of:Fonts:fonts
- @of:UTF-8:utf8
-- @o:HelpDialog:help
-+ @o:HelpDialog:help_dialog
- @o:Input Choice:input_choice
- @o:Preferences:preferences
- @o:Threading:threads
-diff --git a/test/help.cxx b/test/help_dialog.cxx
-similarity index 88%
-rename from test/help.cxx
-rename to test/help_dialog.cxx
-index f5c51d6..7866641 100644
---- a/test/help.cxx
-+++ b/test/help_dialog.cxx
-@@ -3,7 +3,7 @@
- //
- // Fl_Help_Dialog test program.
- //
--// Copyright 1999-2010 by Easy Software Products.
-+// Copyright 2011-2017 by Bill Spitzak and others.
- //
- // This library is free software. Distribution and use rights are outlined in
- // the file "COPYING" which should have been included with this file. If this
-@@ -46,13 +46,13 @@ main(int argc, // I - Number of command-line arguments
- strcpy(buf, argv[0]);
- char *slash = strrchr(buf, '/');
- if (slash)
-- strcpy(slash, "/../Resources/help-test.html");
-+ strcpy(slash, "/../Resources/help_dialog.html");
- help->load(buf);
-
- #else
-
- if (argc <= 1)
-- help->load("help-test.html");
-+ help->load("help_dialog.html");
- else
- help->load(argv[1]);
-
-diff --git a/test/help-test.html b/test/help_dialog.html
-similarity index 100%
-rename from test/help-test.html
-rename to test/help_dialog.html
--
2.31.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 2/7] botan: upgrade 2.14.0 -> 2.18.1
2021-05-23 22:33 [PATCH 1/7] fltk: upgrade 1.3.5 -> 1.3.6 Andreas Müller
@ 2021-05-23 22:33 ` Andreas Müller
2021-05-23 22:33 ` [PATCH 3/7] dialog: upgrade 1.3-20210319 -> 1.3-20210509 Andreas Müller
` (4 subsequent siblings)
5 siblings, 0 replies; 8+ messages in thread
From: Andreas Müller @ 2021-05-23 22:33 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
.../recipes-crypto/botan/{botan_2.14.0.bb => botan_2.18.1.bb} | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
rename meta-oe/recipes-crypto/botan/{botan_2.14.0.bb => botan_2.18.1.bb} (89%)
diff --git a/meta-oe/recipes-crypto/botan/botan_2.14.0.bb b/meta-oe/recipes-crypto/botan/botan_2.18.1.bb
similarity index 89%
rename from meta-oe/recipes-crypto/botan/botan_2.14.0.bb
rename to meta-oe/recipes-crypto/botan/botan_2.18.1.bb
index 13b2c6649..041eff039 100644
--- a/meta-oe/recipes-crypto/botan/botan_2.14.0.bb
+++ b/meta-oe/recipes-crypto/botan/botan_2.18.1.bb
@@ -5,8 +5,7 @@ LIC_FILES_CHKSUM = "file://license.txt;md5=a02e03c8fa2c5e7b9b3fcc1b9811fd3b"
SECTION = "libs"
SRC_URI = "https://botan.randombit.net/releases/Botan-${PV}.tar.xz"
-SRC_URI[md5sum] = "ebc68c08b99bbc4b4fc9bdbfad398b02"
-SRC_URI[sha256sum] = "0c10f12b424a40ee19bde00292098e201d7498535c062d8d5b586d07861a54b5"
+SRC_URI[sha256sum] = "f8c7b46222a857168a754a5cc329bb780504122b270018dda5304c98db28ae29"
S = "${WORKDIR}/Botan-${PV}"
--
2.31.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 3/7] dialog: upgrade 1.3-20210319 -> 1.3-20210509
2021-05-23 22:33 [PATCH 1/7] fltk: upgrade 1.3.5 -> 1.3.6 Andreas Müller
2021-05-23 22:33 ` [PATCH 2/7] botan: upgrade 2.14.0 -> 2.18.1 Andreas Müller
@ 2021-05-23 22:33 ` Andreas Müller
2021-05-23 22:33 ` [PATCH 4/7] colord: upgrade 1.4.4 -> 1.4.5 Andreas Müller
` (3 subsequent siblings)
5 siblings, 0 replies; 8+ messages in thread
From: Andreas Müller @ 2021-05-23 22:33 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
.../{dialog_1.3-20210319.bb => dialog_1.3-20210509.bb} | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
rename meta-oe/recipes-extended/dialog/{dialog_1.3-20210319.bb => dialog_1.3-20210509.bb} (82%)
diff --git a/meta-oe/recipes-extended/dialog/dialog_1.3-20210319.bb b/meta-oe/recipes-extended/dialog/dialog_1.3-20210509.bb
similarity index 82%
rename from meta-oe/recipes-extended/dialog/dialog_1.3-20210319.bb
rename to meta-oe/recipes-extended/dialog/dialog_1.3-20210509.bb
index 5f165617c..2bfa575d7 100644
--- a/meta-oe/recipes-extended/dialog/dialog_1.3-20210319.bb
+++ b/meta-oe/recipes-extended/dialog/dialog_1.3-20210509.bb
@@ -8,10 +8,8 @@ DEPENDS = "ncurses"
LICENSE = "LGPL-2.1"
LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343"
-SRC_URI = "ftp://ftp.invisible-island.net/${BPN}/${BP}.tgz \
- "
-SRC_URI[md5sum] = "45a28836769d52c00c800fa3226c530d"
-SRC_URI[sha256sum] = "42c6c2b35dd6d1c6cf231238e3bd6d3b7af53fc279a1af547ab9890044d46652"
+SRC_URI = "ftp://ftp.invisible-island.net/${BPN}/${BP}.tgz"
+SRC_URI[sha256sum] = "ae478fe7d5fca82bcf4b51684641e07d2ee68489d319710fe1e81f41a197bd66"
# hardcoded here for use in dialog-static recipe
S = "${WORKDIR}/dialog-${PV}"
--
2.31.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 4/7] colord: upgrade 1.4.4 -> 1.4.5
2021-05-23 22:33 [PATCH 1/7] fltk: upgrade 1.3.5 -> 1.3.6 Andreas Müller
2021-05-23 22:33 ` [PATCH 2/7] botan: upgrade 2.14.0 -> 2.18.1 Andreas Müller
2021-05-23 22:33 ` [PATCH 3/7] dialog: upgrade 1.3-20210319 -> 1.3-20210509 Andreas Müller
@ 2021-05-23 22:33 ` Andreas Müller
2021-05-23 22:33 ` [PATCH 5/7] flatbuffers: upgrade 1.12.0 -> 2.0.0 Andreas Müller
` (2 subsequent siblings)
5 siblings, 0 replies; 8+ messages in thread
From: Andreas Müller @ 2021-05-23 22:33 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
...ve-the-function-cd_icc_create_from_edid-to-avoid-u.patch | 6 +++---
meta-oe/recipes-support/colord/colord.inc | 5 ++---
2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/meta-oe/recipes-support/colord/colord-native/0001-Move-the-function-cd_icc_create_from_edid-to-avoid-u.patch b/meta-oe/recipes-support/colord/colord-native/0001-Move-the-function-cd_icc_create_from_edid-to-avoid-u.patch
index 278b90e07..aae2be8c1 100644
--- a/meta-oe/recipes-support/colord/colord-native/0001-Move-the-function-cd_icc_create_from_edid-to-avoid-u.patch
+++ b/meta-oe/recipes-support/colord/colord-native/0001-Move-the-function-cd_icc_create_from_edid-to-avoid-u.patch
@@ -89,11 +89,11 @@ index a5e2328..dec509a 100644
+}
+
diff --git a/lib/colord/cd-icc.c b/lib/colord/cd-icc.c
-index f231814..2c8fe77 100644
+index 8beec43..398ff7a 100644
--- a/lib/colord/cd-icc.c
+++ b/lib/colord/cd-icc.c
-@@ -3094,68 +3094,6 @@ out:
- return ret;
+@@ -3114,68 +3114,6 @@ cd_icc_create_default (CdIcc *icc, GError **error)
+ return cd_icc_create_default_full (icc, CD_ICC_LOAD_FLAGS_NONE, error);
}
-/**
diff --git a/meta-oe/recipes-support/colord/colord.inc b/meta-oe/recipes-support/colord/colord.inc
index 7497fed51..09e600c94 100644
--- a/meta-oe/recipes-support/colord/colord.inc
+++ b/meta-oe/recipes-support/colord/colord.inc
@@ -6,8 +6,7 @@ LIC_FILES_CHKSUM = " \
file://meson.build;beginline=3;endline=3;md5=f42198707d793be58b274d34fd5238c3 \
"
-PV = "1.4.4"
+PV = "1.4.5"
SRC_URI = "https://www.freedesktop.org/software/colord/releases/${BPN}-${PV}.tar.xz"
-SRC_URI[md5sum] = "32c2709a6002d9ee750483aaed6379c8"
-SRC_URI[sha256sum] = "9a0fe80160bf88efddb582a9fc0169f56065276dc3882c47dddb9eecd048c0a5"
+SRC_URI[sha256sum] = "b774ea443d239f4a2ee1853bd678426e669ddeda413dcb71cea1638c4d6c5e17"
--
2.31.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 5/7] flatbuffers: upgrade 1.12.0 -> 2.0.0
2021-05-23 22:33 [PATCH 1/7] fltk: upgrade 1.3.5 -> 1.3.6 Andreas Müller
` (2 preceding siblings ...)
2021-05-23 22:33 ` [PATCH 4/7] colord: upgrade 1.4.4 -> 1.4.5 Andreas Müller
@ 2021-05-23 22:33 ` Andreas Müller
2021-05-23 22:33 ` [PATCH 6/7] gtkwave: upgrade 3.3.108 -> 3.3.109 / move to gtk3 / tidy up recipe Andreas Müller
2021-05-23 22:33 ` [PATCH 7/7] hwdata: upgrade 0.346 -> 0.347 Andreas Müller
5 siblings, 0 replies; 8+ messages in thread
From: Andreas Müller @ 2021-05-23 22:33 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
.../{flatbuffers_1.12.0.bb => flatbuffers_2.0.0.bb} | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
rename meta-oe/recipes-devtools/flatbuffers/{flatbuffers_1.12.0.bb => flatbuffers_2.0.0.bb} (95%)
diff --git a/meta-oe/recipes-devtools/flatbuffers/flatbuffers_1.12.0.bb b/meta-oe/recipes-devtools/flatbuffers/flatbuffers_2.0.0.bb
similarity index 95%
rename from meta-oe/recipes-devtools/flatbuffers/flatbuffers_1.12.0.bb
rename to meta-oe/recipes-devtools/flatbuffers/flatbuffers_2.0.0.bb
index bbc2a4a1d..f4f08012b 100644
--- a/meta-oe/recipes-devtools/flatbuffers/flatbuffers_1.12.0.bb
+++ b/meta-oe/recipes-devtools/flatbuffers/flatbuffers_2.0.0.bb
@@ -13,9 +13,9 @@ RDEPENDS_${PN}-dev += "${PN}-compiler"
LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57"
-SRCREV = "6df40a2471737b27271bdd9b900ab5f3aec746c7"
-
+SRCREV = "a9a295fecf3fbd5a4f571f53b01f63202a3e2113"
SRC_URI = "git://github.com/google/flatbuffers.git"
+S = "${WORKDIR}/git"
CVE_CHECK_WHITELIST += "CVE-2020-35864"
@@ -31,8 +31,6 @@ EXTRA_OECMAKE += "\
inherit cmake
-S = "${WORKDIR}/git"
-
do_install_append() {
install -d ${D}${PYTHON_SITEPACKAGES_DIR}
cp -rf ${S}/python/flatbuffers ${D}${PYTHON_SITEPACKAGES_DIR}
--
2.31.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 6/7] gtkwave: upgrade 3.3.108 -> 3.3.109 / move to gtk3 / tidy up recipe
2021-05-23 22:33 [PATCH 1/7] fltk: upgrade 1.3.5 -> 1.3.6 Andreas Müller
` (3 preceding siblings ...)
2021-05-23 22:33 ` [PATCH 5/7] flatbuffers: upgrade 1.12.0 -> 2.0.0 Andreas Müller
@ 2021-05-23 22:33 ` Andreas Müller
2021-05-29 9:36 ` [oe] " Martin Jansa
2021-05-23 22:33 ` [PATCH 7/7] hwdata: upgrade 0.346 -> 0.347 Andreas Müller
5 siblings, 1 reply; 8+ messages in thread
From: Andreas Müller @ 2021-05-23 22:33 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
...{gtkwave_3.3.108.bb => gtkwave_3.3.109.bb} | 33 ++++++++++++++-----
1 file changed, 25 insertions(+), 8 deletions(-)
rename meta-oe/recipes-graphics/gtkwave/{gtkwave_3.3.108.bb => gtkwave_3.3.109.bb} (47%)
diff --git a/meta-oe/recipes-graphics/gtkwave/gtkwave_3.3.108.bb b/meta-oe/recipes-graphics/gtkwave/gtkwave_3.3.109.bb
similarity index 47%
rename from meta-oe/recipes-graphics/gtkwave/gtkwave_3.3.108.bb
rename to meta-oe/recipes-graphics/gtkwave/gtkwave_3.3.109.bb
index d9b6886ec..2b572f7e2 100644
--- a/meta-oe/recipes-graphics/gtkwave/gtkwave_3.3.108.bb
+++ b/meta-oe/recipes-graphics/gtkwave/gtkwave_3.3.109.bb
@@ -5,19 +5,36 @@ HOMEPAGE = "http://gtkwave.sourceforge.net/"
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=75859989545e37968a99b631ef42722e"
-SRC_URI = "http://gtkwave.sourceforge.net/${BP}.tar.gz"
+SRC_URI = "http://gtkwave.sourceforge.net/gtkwave-gtk3-${PV}.tar.gz"
+SRC_URI[sha256sum] = "35461eccd9b8b4470caa78ab9a8f14ecacbcc9eff63033d8dce58093e786deb7"
+S = "${WORKDIR}/${BPN}-gtk3-${PV}"
-SRC_URI[md5sum] = "dd40f09f44d7aed937e63c29b63cd3af"
-SRC_URI[sha256sum] = "ece447340442e7ad029713789552e8392b75dd3808c882ac5193d42fce55eb3b"
+DEPENDS = " \
+ gperf-native \
+ gtk+3 \
+ gdk-pixbuf \
+ tcl \
+ tk \
+ bzip2 \
+ xz \
+ pango \
+ zlib \
+"
inherit pkgconfig autotools gettext texinfo mime mime-xdg
-DEPENDS += "tcl tk gperf-native bzip2 xz pango zlib gtk+ gdk-pixbuf glib-2.0"
-RDEPENDS_${PN} += "tk-lib"
-# depends on gtk+ which has this restriction
+# depends on gtk+3 which has this restriction
inherit features_check
-ANY_OF_DISTRO_FEATURES = "${GTK2DISTROFEATURES}"
+ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
-EXTRA_OECONF = "--with-tcl=${STAGING_BINDIR_CROSS} --with-tk=${STAGING_BINDIR_CROSS} --with-tirpc --disable-mime-update"
+EXTRA_OECONF = " \
+ --enable-gtk3 \
+ --with-tcl=${STAGING_BINDIR_CROSS} \
+ --with-tk=${STAGING_BINDIR_CROSS} \
+ --with-tirpc \
+ --disable-mime-update \
+"
FILES_${PN} = "${bindir} ${datadir}"
+
+RDEPENDS_${PN} += "tk-lib"
--
2.31.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 7/7] hwdata: upgrade 0.346 -> 0.347
2021-05-23 22:33 [PATCH 1/7] fltk: upgrade 1.3.5 -> 1.3.6 Andreas Müller
` (4 preceding siblings ...)
2021-05-23 22:33 ` [PATCH 6/7] gtkwave: upgrade 3.3.108 -> 3.3.109 / move to gtk3 / tidy up recipe Andreas Müller
@ 2021-05-23 22:33 ` Andreas Müller
5 siblings, 0 replies; 8+ messages in thread
From: Andreas Müller @ 2021-05-23 22:33 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
.../recipes-support/hwdata/{hwdata_git.bb => hwdata_0.347.bb} | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
rename meta-oe/recipes-support/hwdata/{hwdata_git.bb => hwdata_0.347.bb} (88%)
diff --git a/meta-oe/recipes-support/hwdata/hwdata_git.bb b/meta-oe/recipes-support/hwdata/hwdata_0.347.bb
similarity index 88%
rename from meta-oe/recipes-support/hwdata/hwdata_git.bb
rename to meta-oe/recipes-support/hwdata/hwdata_0.347.bb
index 738c32d63..43fb9189c 100644
--- a/meta-oe/recipes-support/hwdata/hwdata_git.bb
+++ b/meta-oe/recipes-support/hwdata/hwdata_0.347.bb
@@ -5,10 +5,8 @@ SECTION = "System/Base"
LICENSE = "GPL-2.0+"
LIC_FILES_CHKSUM = "file://LICENSE;md5=1556547711e8246992b999edd9445a57"
-PV = "0.346"
-SRCREV = "a2bff16032a68b089eeb169f09dea08094891c9c"
+SRCREV = "ae89c73d89bb9f416b25ad9e850e9606e66a573e"
SRC_URI = "git://github.com/vcrhonek/${BPN}.git"
-
S = "${WORKDIR}/git"
do_configure() {
--
2.31.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [oe] [PATCH 6/7] gtkwave: upgrade 3.3.108 -> 3.3.109 / move to gtk3 / tidy up recipe
2021-05-23 22:33 ` [PATCH 6/7] gtkwave: upgrade 3.3.108 -> 3.3.109 / move to gtk3 / tidy up recipe Andreas Müller
@ 2021-05-29 9:36 ` Martin Jansa
0 siblings, 0 replies; 8+ messages in thread
From: Martin Jansa @ 2021-05-29 9:36 UTC (permalink / raw)
To: Andreas Müller; +Cc: openembedded-devel
[-- Attachment #1: Type: text/plain, Size: 3344 bytes --]
This is now failing with:
| In file included from ../../gtkwave-gtk3-3.3.109/src/debug.h:17,
| from ../../gtkwave-gtk3-3.3.109/src/vlist.h:18,
| from ../../gtkwave-gtk3-3.3.109/src/analyzer.h:18,
| from ../../gtkwave-gtk3-3.3.109/src/symbol.h:20,
| from ../../gtkwave-gtk3-3.3.109/src/vcd.h:32,
| from ../../gtkwave-gtk3-3.3.109/src/ae2.h:16,
| from ../../gtkwave-gtk3-3.3.109/src/globals.h:27,
| from ../../gtkwave-gtk3-3.3.109/src/timeentry.c:11:
| ../../gtkwave-gtk3-3.3.109/src/gtk23compat.h:12:10: fatal error:
gdk/gdkwayland.h: No such file or directory
| 12 | #include <gdk/gdkwayland.h>
| | ^~~~~~~~~~~~~~~~~~
Will send a patch to restrict REQUIRED_DISTRO_FEATURES to wayland only
(instead of GTK3DISTROFEATURES which includes x11 as well).
On Mon, May 24, 2021 at 12:34 AM Andreas Müller <schnitzeltony@gmail.com>
wrote:
> Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
> ---
> ...{gtkwave_3.3.108.bb => gtkwave_3.3.109.bb} | 33 ++++++++++++++-----
> 1 file changed, 25 insertions(+), 8 deletions(-)
> rename meta-oe/recipes-graphics/gtkwave/{gtkwave_3.3.108.bb =>
> gtkwave_3.3.109.bb} (47%)
>
> diff --git a/meta-oe/recipes-graphics/gtkwave/gtkwave_3.3.108.bb
> b/meta-oe/recipes-graphics/gtkwave/gtkwave_3.3.109.bb
> similarity index 47%
> rename from meta-oe/recipes-graphics/gtkwave/gtkwave_3.3.108.bb
> rename to meta-oe/recipes-graphics/gtkwave/gtkwave_3.3.109.bb
> index d9b6886ec..2b572f7e2 100644
> --- a/meta-oe/recipes-graphics/gtkwave/gtkwave_3.3.108.bb
> +++ b/meta-oe/recipes-graphics/gtkwave/gtkwave_3.3.109.bb
> @@ -5,19 +5,36 @@ HOMEPAGE = "http://gtkwave.sourceforge.net/"
> LICENSE = "GPLv2"
> LIC_FILES_CHKSUM = "file://COPYING;md5=75859989545e37968a99b631ef42722e"
>
> -SRC_URI = "http://gtkwave.sourceforge.net/${BP}.tar.gz"
> +SRC_URI = "http://gtkwave.sourceforge.net/gtkwave-gtk3-${PV}.tar.gz"
> +SRC_URI[sha256sum] =
> "35461eccd9b8b4470caa78ab9a8f14ecacbcc9eff63033d8dce58093e786deb7"
> +S = "${WORKDIR}/${BPN}-gtk3-${PV}"
>
> -SRC_URI[md5sum] = "dd40f09f44d7aed937e63c29b63cd3af"
> -SRC_URI[sha256sum] =
> "ece447340442e7ad029713789552e8392b75dd3808c882ac5193d42fce55eb3b"
> +DEPENDS = " \
> + gperf-native \
> + gtk+3 \
> + gdk-pixbuf \
> + tcl \
> + tk \
> + bzip2 \
> + xz \
> + pango \
> + zlib \
> +"
>
> inherit pkgconfig autotools gettext texinfo mime mime-xdg
> -DEPENDS += "tcl tk gperf-native bzip2 xz pango zlib gtk+ gdk-pixbuf
> glib-2.0"
> -RDEPENDS_${PN} += "tk-lib"
>
> -# depends on gtk+ which has this restriction
> +# depends on gtk+3 which has this restriction
> inherit features_check
> -ANY_OF_DISTRO_FEATURES = "${GTK2DISTROFEATURES}"
> +ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
>
> -EXTRA_OECONF = "--with-tcl=${STAGING_BINDIR_CROSS}
> --with-tk=${STAGING_BINDIR_CROSS} --with-tirpc --disable-mime-update"
> +EXTRA_OECONF = " \
> + --enable-gtk3 \
> + --with-tcl=${STAGING_BINDIR_CROSS} \
> + --with-tk=${STAGING_BINDIR_CROSS} \
> + --with-tirpc \
> + --disable-mime-update \
> +"
>
> FILES_${PN} = "${bindir} ${datadir}"
> +
> +RDEPENDS_${PN} += "tk-lib"
> --
> 2.31.1
>
>
>
>
>
[-- Attachment #2: Type: text/html, Size: 5187 bytes --]
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2021-05-29 9:36 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-05-23 22:33 [PATCH 1/7] fltk: upgrade 1.3.5 -> 1.3.6 Andreas Müller
2021-05-23 22:33 ` [PATCH 2/7] botan: upgrade 2.14.0 -> 2.18.1 Andreas Müller
2021-05-23 22:33 ` [PATCH 3/7] dialog: upgrade 1.3-20210319 -> 1.3-20210509 Andreas Müller
2021-05-23 22:33 ` [PATCH 4/7] colord: upgrade 1.4.4 -> 1.4.5 Andreas Müller
2021-05-23 22:33 ` [PATCH 5/7] flatbuffers: upgrade 1.12.0 -> 2.0.0 Andreas Müller
2021-05-23 22:33 ` [PATCH 6/7] gtkwave: upgrade 3.3.108 -> 3.3.109 / move to gtk3 / tidy up recipe Andreas Müller
2021-05-29 9:36 ` [oe] " Martin Jansa
2021-05-23 22:33 ` [PATCH 7/7] hwdata: upgrade 0.346 -> 0.347 Andreas Müller
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.