diff options
author | Khem Raj <raj.khem@gmail.com> | 2025-07-12 11:03:21 -0700 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2025-07-12 13:50:02 -0700 |
commit | 519b7596863320dbb26ac94e71dc1d43b3b7032e (patch) | |
tree | 415503a0f3fe9cfd0825ae1a9e8b668a4ae1d953 | |
parent | 9117f4f1df1b59c7b2426329400e3efa8d849c2c (diff) | |
download | meta-openembedded-519b7596863320dbb26ac94e71dc1d43b3b7032e.tar.gz |
transmission: Fix build with cmake4
Backport patches for a few sub-modules
Signed-off-by: Khem Raj <raj.khem@gmail.com>
6 files changed, 134 insertions, 0 deletions
diff --git a/meta-oe/recipes-connectivity/transmission/files/0001-Increase-minimum-CMake-version-to-3.10.patch b/meta-oe/recipes-connectivity/transmission/files/0001-Increase-minimum-CMake-version-to-3.10.patch new file mode 100644 index 0000000000..dc293660ff --- /dev/null +++ b/meta-oe/recipes-connectivity/transmission/files/0001-Increase-minimum-CMake-version-to-3.10.patch | |||
@@ -0,0 +1,30 @@ | |||
1 | From b6a145b5a525d892279d87dec4f35785f7d7c3b9 Mon Sep 17 00:00:00 2001 | ||
2 | From: Eric Biggers <ebiggers@google.com> | ||
3 | Date: Sun, 17 Nov 2024 18:39:29 -0800 | ||
4 | Subject: [PATCH] Increase minimum CMake version to 3.10 | ||
5 | |||
6 | CMake 3.31 warns: | ||
7 | |||
8 | CMake Deprecation Warning at CMakeLists.txt:1 (cmake_minimum_required): | ||
9 | Compatibility with CMake < 3.10 will be removed from a future version of | ||
10 | CMake. | ||
11 | |||
12 | Update the VERSION argument <min> value or use a ...<max> suffix to tell | ||
13 | CMake that the project does not need compatibility with older versions. | ||
14 | |||
15 | Upstream-Status: Backport [https://github.com/ebiggers/libdeflate/pull/402] | ||
16 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
17 | --- | ||
18 | CMakeLists.txt | 2 +- | ||
19 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
20 | |||
21 | diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
22 | index d3bc08d..3ca6d64 100644 | ||
23 | --- a/CMakeLists.txt | ||
24 | +++ b/CMakeLists.txt | ||
25 | @@ -1,4 +1,4 @@ | ||
26 | -cmake_minimum_required(VERSION 3.7) | ||
27 | +cmake_minimum_required(VERSION 3.10) | ||
28 | |||
29 | # Default to a release build. | ||
30 | if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES) | ||
diff --git a/meta-oe/recipes-connectivity/transmission/files/0001-build-bump-CMake-version-to-3.10-4.patch b/meta-oe/recipes-connectivity/transmission/files/0001-build-bump-CMake-version-to-3.10-4.patch new file mode 100644 index 0000000000..a08366a36d --- /dev/null +++ b/meta-oe/recipes-connectivity/transmission/files/0001-build-bump-CMake-version-to-3.10-4.patch | |||
@@ -0,0 +1,26 @@ | |||
1 | From a18ae078a32e08a7193d0bae20190060bd1e8b85 Mon Sep 17 00:00:00 2001 | ||
2 | From: Yat Ho <lagoho7@gmail.com> | ||
3 | Date: Thu, 1 May 2025 09:14:19 +0800 | ||
4 | Subject: [PATCH] build: bump CMake version to 3.10 (#4) | ||
5 | |||
6 | CMake < 3.5 compatibility has been removed from CMake 4.0 and CMake < 3.10 compatibility has been deprecated in CMake 3.31. | ||
7 | |||
8 | https://cmake.org/cmake/help/latest/release/4.0.html | ||
9 | https://cmake.org/cmake/help/latest/release/3.31.html | ||
10 | |||
11 | Upstream-Status: Backport [https://github.com/transmission/dht/commit/38c9f261d9b58b76b9eaf85f84ec1b35151a1eac] | ||
12 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
13 | --- | ||
14 | CMakeLists.txt | 2 +- | ||
15 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
16 | |||
17 | diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
18 | index 6d4aa99..596dbfb 100644 | ||
19 | --- a/CMakeLists.txt | ||
20 | +++ b/CMakeLists.txt | ||
21 | @@ -1,4 +1,4 @@ | ||
22 | -cmake_minimum_required(VERSION 2.8) | ||
23 | +cmake_minimum_required(VERSION 3.10) | ||
24 | project(dht C) | ||
25 | |||
26 | add_library(${PROJECT_NAME} STATIC | ||
diff --git a/meta-oe/recipes-connectivity/transmission/files/0001-build-set-minimum-required-CMake-to-3.5.patch b/meta-oe/recipes-connectivity/transmission/files/0001-build-set-minimum-required-CMake-to-3.5.patch new file mode 100644 index 0000000000..887bc21114 --- /dev/null +++ b/meta-oe/recipes-connectivity/transmission/files/0001-build-set-minimum-required-CMake-to-3.5.patch | |||
@@ -0,0 +1,31 @@ | |||
1 | From 9c5ed3204bdb722b5624f6b9dbfba240a50b336c Mon Sep 17 00:00:00 2001 | ||
2 | From: fanquake <fanquake@gmail.com> | ||
3 | Date: Fri, 12 Jan 2024 10:25:27 +0000 | ||
4 | Subject: [PATCH] build: set minimum required CMake to 3.5 | ||
5 | |||
6 | Avoids: | ||
7 | ```bash | ||
8 | CMake Deprecation Warning at CMakeLists.txt:1 (cmake_minimum_required): | ||
9 | Compatibility with CMake < 3.5 will be removed from a future version of | ||
10 | CMake. | ||
11 | |||
12 | Update the VERSION argument <min> value or use a ...<max> suffix to tell | ||
13 | CMake that the project does not need compatibility with older versions. | ||
14 | ``` | ||
15 | |||
16 | Upstream-Status: Backport [https://github.com/miniupnp/libnatpmp/pull/43] | ||
17 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
18 | --- | ||
19 | CMakeLists.txt | 2 +- | ||
20 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
21 | |||
22 | diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
23 | index 3034df8..e7cffe5 100644 | ||
24 | --- a/CMakeLists.txt | ||
25 | +++ b/CMakeLists.txt | ||
26 | @@ -1,4 +1,4 @@ | ||
27 | -cmake_minimum_required(VERSION 2.8) | ||
28 | +cmake_minimum_required(VERSION 3.5) | ||
29 | project(natpmp C) | ||
30 | |||
31 | add_definitions(-DNATPMP_STATICLIB -DENABLE_STRNATPMPERR) | ||
diff --git a/meta-oe/recipes-connectivity/transmission/files/0001-bump-cmake-to-3.10.patch b/meta-oe/recipes-connectivity/transmission/files/0001-bump-cmake-to-3.10.patch new file mode 100644 index 0000000000..895013cb1a --- /dev/null +++ b/meta-oe/recipes-connectivity/transmission/files/0001-bump-cmake-to-3.10.patch | |||
@@ -0,0 +1,21 @@ | |||
1 | From c548c2192c6e4b3129711981d6446afd12dbe6e4 Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?C=C5=93ur?= <coeur@gmx.fr> | ||
3 | Date: Thu, 1 May 2025 04:53:55 +0200 | ||
4 | Subject: [PATCH] bump cmake to 3.10 | ||
5 | |||
6 | Upstream-Status: Submitted [https://github.com/transmission/libb64/pull/3] | ||
7 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
8 | --- | ||
9 | CMakeLists.txt | 2 +- | ||
10 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
11 | |||
12 | diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
13 | index ecf6d3b..d500ea6 100644 | ||
14 | --- a/CMakeLists.txt | ||
15 | +++ b/CMakeLists.txt | ||
16 | @@ -1,4 +1,4 @@ | ||
17 | -cmake_minimum_required(VERSION 3.5 FATAL_ERROR) | ||
18 | +cmake_minimum_required(VERSION 3.10 FATAL_ERROR) | ||
19 | project(libb64 VERSION 2.0.0 LANGUAGES C) | ||
20 | |||
21 | set(LIBB64_STANDALONE_BUILD OFF) | ||
diff --git a/meta-oe/recipes-connectivity/transmission/files/0001-miniupnpc-bump-CMake-version-to-3.14.patch b/meta-oe/recipes-connectivity/transmission/files/0001-miniupnpc-bump-CMake-version-to-3.14.patch new file mode 100644 index 0000000000..1714ad1b99 --- /dev/null +++ b/meta-oe/recipes-connectivity/transmission/files/0001-miniupnpc-bump-CMake-version-to-3.14.patch | |||
@@ -0,0 +1,21 @@ | |||
1 | From aa19cb131c953e4520be5284d86964f371ee059f Mon Sep 17 00:00:00 2001 | ||
2 | From: Yat Ho <lagoho7@gmail.com> | ||
3 | Date: Mon, 13 May 2024 16:21:28 +0800 | ||
4 | Subject: [PATCH] miniupnpc: bump CMake version to 3.14 | ||
5 | |||
6 | Upstream-Status: Backport [https://github.com/transmission/miniupnpc/commit/e7b0fa83c313c50a66da76ad6fb446e5bfdb482f] | ||
7 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
8 | --- | ||
9 | CMakeLists.txt | 2 +- | ||
10 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
11 | |||
12 | diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
13 | index 0a53e27..2c713b5 100644 | ||
14 | --- a/CMakeLists.txt | ||
15 | +++ b/CMakeLists.txt | ||
16 | @@ -1,4 +1,4 @@ | ||
17 | -cmake_minimum_required (VERSION 2.6) | ||
18 | +cmake_minimum_required (VERSION 3.14) | ||
19 | |||
20 | project (miniupnpc C) | ||
21 | set (MINIUPNPC_VERSION 2.0) | ||
diff --git a/meta-oe/recipes-connectivity/transmission/transmission_4.0.6.bb b/meta-oe/recipes-connectivity/transmission/transmission_4.0.6.bb index 5d0dd6a389..518f8653ca 100644 --- a/meta-oe/recipes-connectivity/transmission/transmission_4.0.6.bb +++ b/meta-oe/recipes-connectivity/transmission/transmission_4.0.6.bb | |||
@@ -9,6 +9,11 @@ RDEPENDS:${PN}-web = "${PN}" | |||
9 | 9 | ||
10 | SRC_URI = " \ | 10 | SRC_URI = " \ |
11 | gitsm://github.com/transmission/transmission;branch=4.0.x;protocol=https \ | 11 | gitsm://github.com/transmission/transmission;branch=4.0.x;protocol=https \ |
12 | file://0001-build-bump-CMake-version-to-3.10-4.patch;patchdir=third-party/dht \ | ||
13 | file://0001-bump-cmake-to-3.10.patch;patchdir=third-party/libb64 \ | ||
14 | file://0001-Increase-minimum-CMake-version-to-3.10.patch;patchdir=third-party/libdeflate \ | ||
15 | file://0001-miniupnpc-bump-CMake-version-to-3.14.patch;patchdir=third-party/miniupnpc \ | ||
16 | file://0001-build-set-minimum-required-CMake-to-3.5.patch;patchdir=third-party/libnatpmp \ | ||
12 | file://transmission-daemon \ | 17 | file://transmission-daemon \ |
13 | " | 18 | " |
14 | 19 | ||