* [Buildroot] [PATCH v2,1/3] package/cmake: bump to version 3.18.6
@ 2022-03-09 22:00 Fabrice Fontaine
2022-03-09 22:00 ` [Buildroot] [PATCH v2, 2/3] support/dependencies: requires cmake >= 3.18 Fabrice Fontaine
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Fabrice Fontaine @ 2022-03-09 22:00 UTC (permalink / raw)
To: buildroot; +Cc: Fabrice Fontaine, Thomas Petazzoni
Update hash of Copyright.txt (year updated and Qt Company Ltd. added:
https://gitlab.kitware.com/cmake/cmake/-/commit/1edc4a8a7e759c4047dd1a1b9864b34f6cb4cc50
https://gitlab.kitware.com/cmake/cmake/-/commit/f8c505d4b30aa636b013486913591060b2040716)
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
package/cmake/cmake.hash | 6 +++---
package/cmake/cmake.mk | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/package/cmake/cmake.hash b/package/cmake/cmake.hash
index 97e83a274c..da514a6d6b 100644
--- a/package/cmake/cmake.hash
+++ b/package/cmake/cmake.hash
@@ -1,5 +1,5 @@
-# From https://cmake.org/files/v3.16/cmake-3.16.9-SHA-256.txt
-sha256 1708361827a5a0de37d55f5c9698004c035abb1de6120a376d5d59a81630191f cmake-3.16.9.tar.gz
+# From https://cmake.org/files/v3.18/cmake-3.18.6-SHA-256.txt
+sha256 124f571ab70332da97a173cb794dfa09a5b20ccbb80a08e56570a500f47b6600 cmake-3.18.6.tar.gz
# Locally calculated
-sha256 dc628fb936a5d229296d42083f9a8218aa32204c016919e784404c9ec58776e9 Copyright.txt
+sha256 131b9ff756b64a25b7461c3c1382e70b16c70a5b4833a1577897fa3ea6d88f8d Copyright.txt
diff --git a/package/cmake/cmake.mk b/package/cmake/cmake.mk
index b1b214982e..4177b119ab 100644
--- a/package/cmake/cmake.mk
+++ b/package/cmake/cmake.mk
@@ -4,8 +4,8 @@
#
################################################################################
-CMAKE_VERSION_MAJOR = 3.16
-CMAKE_VERSION = $(CMAKE_VERSION_MAJOR).9
+CMAKE_VERSION_MAJOR = 3.18
+CMAKE_VERSION = $(CMAKE_VERSION_MAJOR).6
CMAKE_SITE = https://cmake.org/files/v$(CMAKE_VERSION_MAJOR)
CMAKE_LICENSE = BSD-3-Clause
CMAKE_LICENSE_FILES = Copyright.txt
--
2.34.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH v2, 2/3] support/dependencies: requires cmake >= 3.18
2022-03-09 22:00 [Buildroot] [PATCH v2,1/3] package/cmake: bump to version 3.18.6 Fabrice Fontaine
@ 2022-03-09 22:00 ` Fabrice Fontaine
2022-03-21 21:09 ` Arnout Vandecappelle
2022-03-09 22:00 ` [Buildroot] [PATCH v2, 3/3] package/gerbera: bump to version 1.10.0 Fabrice Fontaine
2022-03-21 21:09 ` [Buildroot] [PATCH v2, 1/3] package/cmake: bump to version 3.18.6 Arnout Vandecappelle
2 siblings, 1 reply; 6+ messages in thread
From: Fabrice Fontaine @ 2022-03-09 22:00 UTC (permalink / raw)
To: buildroot; +Cc: Fabrice Fontaine, Thomas Petazzoni
gerbera requires cmake 3.18 since version 1.10.0 and
https://github.com/gerbera/gerbera/commit/ac05976dda335ce1c28a5cc78e4e009a145e3559
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
support/dependencies/check-host-cmake.mk | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/support/dependencies/check-host-cmake.mk b/support/dependencies/check-host-cmake.mk
index dfc252e919..5760e4ded1 100644
--- a/support/dependencies/check-host-cmake.mk
+++ b/support/dependencies/check-host-cmake.mk
@@ -1,9 +1,9 @@
-# Set this to either 3.16 or higher, depending on the highest minimum
+# Set this to either 3.18 or higher, depending on the highest minimum
# version required by any of the packages bundled in Buildroot. If a
# package is bumped or a new one added, and it requires a higher
# version, our cmake infra will catch it and build its own.
#
-BR2_CMAKE_VERSION_MIN = 3.16
+BR2_CMAKE_VERSION_MIN = 3.18
BR2_CMAKE_CANDIDATES ?= cmake cmake3
BR2_CMAKE ?= $(call suitable-host-package,cmake,\
--
2.34.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH v2, 3/3] package/gerbera: bump to version 1.10.0
2022-03-09 22:00 [Buildroot] [PATCH v2,1/3] package/cmake: bump to version 3.18.6 Fabrice Fontaine
2022-03-09 22:00 ` [Buildroot] [PATCH v2, 2/3] support/dependencies: requires cmake >= 3.18 Fabrice Fontaine
@ 2022-03-09 22:00 ` Fabrice Fontaine
2022-03-21 21:09 ` Arnout Vandecappelle
2022-03-21 21:09 ` [Buildroot] [PATCH v2, 1/3] package/cmake: bump to version 3.18.6 Arnout Vandecappelle
2 siblings, 1 reply; 6+ messages in thread
From: Fabrice Fontaine @ 2022-03-09 22:00 UTC (permalink / raw)
To: buildroot; +Cc: Fabrice Fontaine, Thomas Petazzoni
Drop patch (already in version)
https://github.com/gerbera/gerbera/releases/tag/v1.10.0
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
Changes v1 -> v2:
- Add cmake patches to the serie
package/gerbera/0001-Fix-for-fmt-8-0.patch | 44 ----------------------
package/gerbera/gerbera.hash | 2 +-
package/gerbera/gerbera.mk | 2 +-
3 files changed, 2 insertions(+), 46 deletions(-)
delete mode 100644 package/gerbera/0001-Fix-for-fmt-8-0.patch
diff --git a/package/gerbera/0001-Fix-for-fmt-8-0.patch b/package/gerbera/0001-Fix-for-fmt-8-0.patch
deleted file mode 100644
index c4419209a5..0000000000
--- a/package/gerbera/0001-Fix-for-fmt-8-0.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 82d84ac5e62c23e717198fc7b2ef190ff95e70d1 Mon Sep 17 00:00:00 2001
-From: kyak <bas@bmail.ru>
-Date: Wed, 12 Jan 2022 19:41:37 +0300
-Subject: [PATCH] Fix for fmt > 8.0
-
-[Retrieved from:
-https://github.com/gerbera/gerbera/commit/82d84ac5e62c23e717198fc7b2ef190ff95e70d1]
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
----
- src/util/logger.h | 15 +++++++++++++++
- 1 file changed, 15 insertions(+)
-
-diff --git a/src/util/logger.h b/src/util/logger.h
-index 58696e52f..ba64afa79 100644
---- a/src/util/logger.h
-+++ b/src/util/logger.h
-@@ -32,7 +32,9 @@
- #ifndef __LOGGER_H__
- #define __LOGGER_H__
-
-+#include <fmt/format.h>
- #include <spdlog/spdlog.h>
-+#include <type_traits>
-
- #define log_debug SPDLOG_DEBUG
- #define log_info SPDLOG_INFO
-@@ -40,4 +42,17 @@
- #define log_error SPDLOG_ERROR
- #define log_js SPDLOG_INFO
-
-+#if FMT_VERSION >= 80100
-+template <typename T>
-+struct fmt::formatter<T, std::enable_if_t<std::is_enum_v<T>, char>>
-+ : formatter<std::underlying_type_t<T>> {
-+ template <typename FormatContext>
-+ auto format(const T& value, FormatContext& ctx) -> decltype(ctx.out())
-+ {
-+ return fmt::formatter<std::underlying_type_t<T>>::format(
-+ static_cast<std::underlying_type_t<T>>(value), ctx);
-+ }
-+};
-+#endif
-+
- #endif // __LOGGER_H__
diff --git a/package/gerbera/gerbera.hash b/package/gerbera/gerbera.hash
index 5dcd364c33..89ac9ad55a 100644
--- a/package/gerbera/gerbera.hash
+++ b/package/gerbera/gerbera.hash
@@ -1,3 +1,3 @@
# Locally computed:
-sha256 dee562cc5d22e8442e2fe1620b073bda612c80f9c4a8333311c647db06c1c4cd gerbera-1.9.2.tar.gz
+sha256 bd6c7b2c6380e2e265a998bbc0df9eec14b9c6a65bc91e7f2c0ae0b67fd0c9cf gerbera-1.10.0.tar.gz
sha256 cae4138373be41fd2be75faf41ce7efbcf49fb17d0e05ad1c51cc01ac335b9b6 LICENSE.md
diff --git a/package/gerbera/gerbera.mk b/package/gerbera/gerbera.mk
index ab49f661ac..6acdfb86ac 100644
--- a/package/gerbera/gerbera.mk
+++ b/package/gerbera/gerbera.mk
@@ -4,7 +4,7 @@
#
################################################################################
-GERBERA_VERSION = 1.9.2
+GERBERA_VERSION = 1.10.0
GERBERA_SITE = $(call github,gerbera,gerbera,v$(GERBERA_VERSION))
GERBERA_LICENSE = GPL-2.0
GERBERA_LICENSE_FILES = LICENSE.md
--
2.34.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [Buildroot] [PATCH v2, 1/3] package/cmake: bump to version 3.18.6
2022-03-09 22:00 [Buildroot] [PATCH v2,1/3] package/cmake: bump to version 3.18.6 Fabrice Fontaine
2022-03-09 22:00 ` [Buildroot] [PATCH v2, 2/3] support/dependencies: requires cmake >= 3.18 Fabrice Fontaine
2022-03-09 22:00 ` [Buildroot] [PATCH v2, 3/3] package/gerbera: bump to version 1.10.0 Fabrice Fontaine
@ 2022-03-21 21:09 ` Arnout Vandecappelle
2 siblings, 0 replies; 6+ messages in thread
From: Arnout Vandecappelle @ 2022-03-21 21:09 UTC (permalink / raw)
To: Fabrice Fontaine, buildroot; +Cc: Thomas Petazzoni
On 09/03/2022 23:00, Fabrice Fontaine wrote:
> Update hash of Copyright.txt (year updated and Qt Company Ltd. added:
> https://gitlab.kitware.com/cmake/cmake/-/commit/1edc4a8a7e759c4047dd1a1b9864b34f6cb4cc50
> https://gitlab.kitware.com/cmake/cmake/-/commit/f8c505d4b30aa636b013486913591060b2040716)
>
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Applied to master, thanks.
This may create some fallout, but the autobuilders will tell us.
Regards,
Arnout
> ---
> package/cmake/cmake.hash | 6 +++---
> package/cmake/cmake.mk | 4 ++--
> 2 files changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/package/cmake/cmake.hash b/package/cmake/cmake.hash
> index 97e83a274c..da514a6d6b 100644
> --- a/package/cmake/cmake.hash
> +++ b/package/cmake/cmake.hash
> @@ -1,5 +1,5 @@
> -# From https://cmake.org/files/v3.16/cmake-3.16.9-SHA-256.txt
> -sha256 1708361827a5a0de37d55f5c9698004c035abb1de6120a376d5d59a81630191f cmake-3.16.9.tar.gz
> +# From https://cmake.org/files/v3.18/cmake-3.18.6-SHA-256.txt
> +sha256 124f571ab70332da97a173cb794dfa09a5b20ccbb80a08e56570a500f47b6600 cmake-3.18.6.tar.gz
>
> # Locally calculated
> -sha256 dc628fb936a5d229296d42083f9a8218aa32204c016919e784404c9ec58776e9 Copyright.txt
> +sha256 131b9ff756b64a25b7461c3c1382e70b16c70a5b4833a1577897fa3ea6d88f8d Copyright.txt
> diff --git a/package/cmake/cmake.mk b/package/cmake/cmake.mk
> index b1b214982e..4177b119ab 100644
> --- a/package/cmake/cmake.mk
> +++ b/package/cmake/cmake.mk
> @@ -4,8 +4,8 @@
> #
> ################################################################################
>
> -CMAKE_VERSION_MAJOR = 3.16
> -CMAKE_VERSION = $(CMAKE_VERSION_MAJOR).9
> +CMAKE_VERSION_MAJOR = 3.18
> +CMAKE_VERSION = $(CMAKE_VERSION_MAJOR).6
> CMAKE_SITE = https://cmake.org/files/v$(CMAKE_VERSION_MAJOR)
> CMAKE_LICENSE = BSD-3-Clause
> CMAKE_LICENSE_FILES = Copyright.txt
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Buildroot] [PATCH v2, 2/3] support/dependencies: requires cmake >= 3.18
2022-03-09 22:00 ` [Buildroot] [PATCH v2, 2/3] support/dependencies: requires cmake >= 3.18 Fabrice Fontaine
@ 2022-03-21 21:09 ` Arnout Vandecappelle
0 siblings, 0 replies; 6+ messages in thread
From: Arnout Vandecappelle @ 2022-03-21 21:09 UTC (permalink / raw)
To: Fabrice Fontaine, buildroot; +Cc: Thomas Petazzoni
On 09/03/2022 23:00, Fabrice Fontaine wrote:
> gerbera requires cmake 3.18 since version 1.10.0 and
> https://github.com/gerbera/gerbera/commit/ac05976dda335ce1c28a5cc78e4e009a145e3559
>
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Applied to master, thanks.
Regards,
Arnout
> ---
> support/dependencies/check-host-cmake.mk | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/support/dependencies/check-host-cmake.mk b/support/dependencies/check-host-cmake.mk
> index dfc252e919..5760e4ded1 100644
> --- a/support/dependencies/check-host-cmake.mk
> +++ b/support/dependencies/check-host-cmake.mk
> @@ -1,9 +1,9 @@
> -# Set this to either 3.16 or higher, depending on the highest minimum
> +# Set this to either 3.18 or higher, depending on the highest minimum
> # version required by any of the packages bundled in Buildroot. If a
> # package is bumped or a new one added, and it requires a higher
> # version, our cmake infra will catch it and build its own.
> #
> -BR2_CMAKE_VERSION_MIN = 3.16
> +BR2_CMAKE_VERSION_MIN = 3.18
>
> BR2_CMAKE_CANDIDATES ?= cmake cmake3
> BR2_CMAKE ?= $(call suitable-host-package,cmake,\
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Buildroot] [PATCH v2, 3/3] package/gerbera: bump to version 1.10.0
2022-03-09 22:00 ` [Buildroot] [PATCH v2, 3/3] package/gerbera: bump to version 1.10.0 Fabrice Fontaine
@ 2022-03-21 21:09 ` Arnout Vandecappelle
0 siblings, 0 replies; 6+ messages in thread
From: Arnout Vandecappelle @ 2022-03-21 21:09 UTC (permalink / raw)
To: Fabrice Fontaine, buildroot; +Cc: Thomas Petazzoni
On 09/03/2022 23:00, Fabrice Fontaine wrote:
> Drop patch (already in version)
>
> https://github.com/gerbera/gerbera/releases/tag/v1.10.0
>
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
I applied [1] instead, which also updates the config.xml file.
Regards,
Arnout
[1]
https://patchwork.ozlabs.org/project/buildroot/patch/20220320185144.10894-1-joerg.krause@embedded.rocks/
> ---
> Changes v1 -> v2:
> - Add cmake patches to the serie
>
> package/gerbera/0001-Fix-for-fmt-8-0.patch | 44 ----------------------
> package/gerbera/gerbera.hash | 2 +-
> package/gerbera/gerbera.mk | 2 +-
> 3 files changed, 2 insertions(+), 46 deletions(-)
> delete mode 100644 package/gerbera/0001-Fix-for-fmt-8-0.patch
>
> diff --git a/package/gerbera/0001-Fix-for-fmt-8-0.patch b/package/gerbera/0001-Fix-for-fmt-8-0.patch
> deleted file mode 100644
> index c4419209a5..0000000000
> --- a/package/gerbera/0001-Fix-for-fmt-8-0.patch
> +++ /dev/null
> @@ -1,44 +0,0 @@
> -From 82d84ac5e62c23e717198fc7b2ef190ff95e70d1 Mon Sep 17 00:00:00 2001
> -From: kyak <bas@bmail.ru>
> -Date: Wed, 12 Jan 2022 19:41:37 +0300
> -Subject: [PATCH] Fix for fmt > 8.0
> -
> -[Retrieved from:
> -https://github.com/gerbera/gerbera/commit/82d84ac5e62c23e717198fc7b2ef190ff95e70d1]
> -Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> ----
> - src/util/logger.h | 15 +++++++++++++++
> - 1 file changed, 15 insertions(+)
> -
> -diff --git a/src/util/logger.h b/src/util/logger.h
> -index 58696e52f..ba64afa79 100644
> ---- a/src/util/logger.h
> -+++ b/src/util/logger.h
> -@@ -32,7 +32,9 @@
> - #ifndef __LOGGER_H__
> - #define __LOGGER_H__
> -
> -+#include <fmt/format.h>
> - #include <spdlog/spdlog.h>
> -+#include <type_traits>
> -
> - #define log_debug SPDLOG_DEBUG
> - #define log_info SPDLOG_INFO
> -@@ -40,4 +42,17 @@
> - #define log_error SPDLOG_ERROR
> - #define log_js SPDLOG_INFO
> -
> -+#if FMT_VERSION >= 80100
> -+template <typename T>
> -+struct fmt::formatter<T, std::enable_if_t<std::is_enum_v<T>, char>>
> -+ : formatter<std::underlying_type_t<T>> {
> -+ template <typename FormatContext>
> -+ auto format(const T& value, FormatContext& ctx) -> decltype(ctx.out())
> -+ {
> -+ return fmt::formatter<std::underlying_type_t<T>>::format(
> -+ static_cast<std::underlying_type_t<T>>(value), ctx);
> -+ }
> -+};
> -+#endif
> -+
> - #endif // __LOGGER_H__
> diff --git a/package/gerbera/gerbera.hash b/package/gerbera/gerbera.hash
> index 5dcd364c33..89ac9ad55a 100644
> --- a/package/gerbera/gerbera.hash
> +++ b/package/gerbera/gerbera.hash
> @@ -1,3 +1,3 @@
> # Locally computed:
> -sha256 dee562cc5d22e8442e2fe1620b073bda612c80f9c4a8333311c647db06c1c4cd gerbera-1.9.2.tar.gz
> +sha256 bd6c7b2c6380e2e265a998bbc0df9eec14b9c6a65bc91e7f2c0ae0b67fd0c9cf gerbera-1.10.0.tar.gz
> sha256 cae4138373be41fd2be75faf41ce7efbcf49fb17d0e05ad1c51cc01ac335b9b6 LICENSE.md
> diff --git a/package/gerbera/gerbera.mk b/package/gerbera/gerbera.mk
> index ab49f661ac..6acdfb86ac 100644
> --- a/package/gerbera/gerbera.mk
> +++ b/package/gerbera/gerbera.mk
> @@ -4,7 +4,7 @@
> #
> ################################################################################
>
> -GERBERA_VERSION = 1.9.2
> +GERBERA_VERSION = 1.10.0
> GERBERA_SITE = $(call github,gerbera,gerbera,v$(GERBERA_VERSION))
> GERBERA_LICENSE = GPL-2.0
> GERBERA_LICENSE_FILES = LICENSE.md
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2022-03-21 21:10 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-03-09 22:00 [Buildroot] [PATCH v2,1/3] package/cmake: bump to version 3.18.6 Fabrice Fontaine
2022-03-09 22:00 ` [Buildroot] [PATCH v2, 2/3] support/dependencies: requires cmake >= 3.18 Fabrice Fontaine
2022-03-21 21:09 ` Arnout Vandecappelle
2022-03-09 22:00 ` [Buildroot] [PATCH v2, 3/3] package/gerbera: bump to version 1.10.0 Fabrice Fontaine
2022-03-21 21:09 ` Arnout Vandecappelle
2022-03-21 21:09 ` [Buildroot] [PATCH v2, 1/3] package/cmake: bump to version 3.18.6 Arnout Vandecappelle
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.