Skip to contentSkip to conversation

package/cmake: bump to version 3.18.6

PATCH Applied Fabrice Fontaine 2 participants 6 messages Mar 9, 2022 – Mar 21, 2022

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/3 package/cmake: bump to version 3.18.6

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)

---
 package/cmake/cmake.hash | 6 +++---
 package/cmake/cmake.mk   | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)
package/cmake/cmake.hash +3 -3
index 97e83a274c..da514a6d6b 100644
@@ -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
package/cmake/cmake.mk +2 -2
index b1b214982e..4177b119ab 100644
@@ -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
Signature · 6 lines
2.34.1

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#1 lore raw

PATCH v2 2/3 support/dependencies: requires cmake >= 3.18

gerbera requires cmake 3.18 since version 1.10.0 and
https://github.com/gerbera/gerbera/commit/ac05976dda335ce1c28a5cc78e4e009a145e3559

---
 support/dependencies/check-host-cmake.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
support/dependencies/check-host-cmake.mk +2 -2
index dfc252e919..5760e4ded1 100644
@@ -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,\
Signature · 6 lines
2.34.1

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#2 lore raw

Re: [Buildroot] [PATCH v2, 2/3] support/dependencies: requires cmake >= 3.18

Quoted 4 lines · Fabrice Fontaine

gerbera requires cmake 3.18 since version 1.10.0 and
https://github.com/gerbera/gerbera/commit/ac05976dda335ce1c28a5cc78e4e009a145e3559

Applied to master, thanks.

Regards,
Arnout

Quoted 10 lines
---
  support/dependencies/check-host-cmake.mk | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
support/dependencies/check-host-cmake.mk +0 -1
index dfc252e919..5760e4ded1 100644
@@ -1,9 +1,9 @@
-# Set this to either 3.16 or higher, depending on the highest minimum

support/dependencies/check-host-cmake.mk line 9

Quoted 10 lines
support/dependencies/check-host-cmake.mk +2 -1
+# 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
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot

#3 lore raw

PATCH v2 3/3 package/gerbera: bump to version 1.10.0

In reply to Fabrice Fontaine

Drop patch (already in version)

https://github.com/gerbera/gerbera/releases/tag/v1.10.0

---
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
package/gerbera/0001-Fix-for-fmt-8-0.patch deleted +0 -44
deleted file mode 100644
index c4419209a5..0000000000
@@ -1,44 +0,0 @@
-From 82d84ac5e62c23e717198fc7b2ef190ff95e70d1 Mon Sep 17 00:00:00 2001
-From: kyak <[email protected]>
-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 <[email protected]>
----
- 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__
package/gerbera/gerbera.hash +1 -1
index 5dcd364c33..89ac9ad55a 100644
@@ -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
package/gerbera/gerbera.mk +1 -1
index ab49f661ac..6acdfb86ac 100644
@@ -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
Signature · 6 lines
2.34.1

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#4 lore raw

Re: [Buildroot] [PATCH v2, 3/3] package/gerbera: bump to version 1.10.0

Quoted 5 lines · Fabrice Fontaine

Drop patch (already in version)

https://github.com/gerbera/gerbera/releases/tag/v1.10.0

I applied [1] instead, which also updates the config.xml file.

Regards,
Arnout

[1] https://patchwork.ozlabs.org/project/buildroot/patch/[email protected]/

Quoted 74 lines

---
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

package/gerbera/0001-Fix-for-fmt-8-0.patch deleted +0 -44
deleted file mode 100644
index c4419209a5..0000000000
@@ -1,44 +0,0 @@
-From 82d84ac5e62c23e717198fc7b2ef190ff95e70d1 Mon Sep 17 00:00:00 2001
-From: kyak <[email protected]>
-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 <[email protected]>
----
- 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__
package/gerbera/gerbera.hash +1 -1
index 5dcd364c33..89ac9ad55a 100644
@@ -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
package/gerbera/gerbera.mk +0 -0
index ab49f661ac..6acdfb86ac 100644

package/gerbera/gerbera.mk line 10

Quoted 8 lines
package/gerbera/gerbera.mk +1 -1
@@ -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
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot

#5 lore raw
In reply to Fabrice Fontaine
Quoted 5 lines · Fabrice Fontaine

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)

Applied to master, thanks.

This may create some fallout, but the autobuilders will tell us.

Regards,
Arnout

Quoted 23 lines
---
  package/cmake/cmake.hash | 6 +++---
  package/cmake/cmake.mk   | 4 ++--
  2 files changed, 5 insertions(+), 5 deletions(-)
package/cmake/cmake.hash +3 -3
index 97e83a274c..da514a6d6b 100644
@@ -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
package/cmake/cmake.mk +0 -0
index b1b214982e..4177b119ab 100644

package/cmake/cmake.mk line 11

Quoted 10 lines
package/cmake/cmake.mk +2 -2
@@ -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
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot