diff mbox series

[meta-oe,1/2] libtorrent: upgrade 0.16.1 -> 0.16.2

Message ID 20251117075726.2900-1-liuyd.fnst@fujitsu.com
State New
Headers show
Series [meta-oe,1/2] libtorrent: upgrade 0.16.1 -> 0.16.2 | expand

Commit Message

Yiding Liu (Fujitsu) Nov. 17, 2025, 7:57 a.m. UTC 
Remove 0001-scripts-common.m4-Insert-spaces-in-shell-lists.patch as it was merged in upstream.

Signed-off-by: Liu Yiding <liuyd.fnst@fujitsu.com>
---
 ...mmon.m4-Insert-spaces-in-shell-lists.patch | 45 -------------------
 ...torrent_0.16.1.bb => libtorrent_0.16.2.bb} |  5 +--
 2 files changed, 2 insertions(+), 48 deletions(-)
 delete mode 100644 meta-oe/recipes-connectivity/libtorrent/libtorrent/0001-scripts-common.m4-Insert-spaces-in-shell-lists.patch
 rename meta-oe/recipes-connectivity/libtorrent/{libtorrent_0.16.1.bb => libtorrent_0.16.2.bb} (85%)
diff mbox series

Patch

diff --git a/meta-oe/recipes-connectivity/libtorrent/libtorrent/0001-scripts-common.m4-Insert-spaces-in-shell-lists.patch b/meta-oe/recipes-connectivity/libtorrent/libtorrent/0001-scripts-common.m4-Insert-spaces-in-shell-lists.patch
deleted file mode 100644
index 1740b0f478..0000000000
--- a/meta-oe/recipes-connectivity/libtorrent/libtorrent/0001-scripts-common.m4-Insert-spaces-in-shell-lists.patch
+++ /dev/null
@@ -1,45 +0,0 @@ 
-From 9df2559d55c454c7128b65103456c2f88b3bf2f5 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Fri, 24 Oct 2025 08:45:02 -0700
-Subject: [PATCH] scripts/common.m4: Insert spaces in shell lists
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-$1=$(echo "$result" | tr -d '\n')
-
-removes all newlines without inserting spaces
-That usually isn’t what we want for shell lists.
-It should typically be space-separated output.
-
-Fixes a bug seen with yocto where compiler is not a single word
-but a string e.g.
-
-ccache aarch64-yoe-linux-musl-clang++  -mcpu=cortex-a72+crc+nocrypto   --dyld-prefix=/usr -fstack-protector-strong  -O2 -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Werror=format-security --sysroot=/mnt/b/yoe/master/build/tmp/work/cortexa72-yoe-linux-musl/libtorrent/0.16.1/recipe-sysroot
-
-It changes it to
-
-ccacheaarch64-yoe-linux-musl-clang++-mcpu=cortex-a72+crc+nocrypto--dyld-prefix=/usr-fstack-protector-strong-O2-D_FORTIFY_SOURCE=2-Wformat-Wformat-security-Werror=format-security--sysroot=/mnt/b/yoe/master/build/tmp/work/cortexa72-yoe-linux-musl/libtorrent/0.16.1/recipe-sysroot
-
-When doing c++17 checks on compiler, resulting in failure
-
-Upstream-Status: Submitted [https://github.com/rakshasa/libtorrent/pull/583]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- scripts/common.m4 | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/scripts/common.m4 b/scripts/common.m4
-index 74b99e6a..44a5fe65 100644
---- a/scripts/common.m4
-+++ b/scripts/common.m4
-@@ -30,7 +30,8 @@ AC_DEFUN([TORRENT_REMOVE_UNWANTED],
-     $1="$2"
-   else
-     result=`echo "${values_to_check}" | $GREP -Fvx -- "${unwanted_values}" | $GREP -v '^$'`
--    $1=$(echo "$result" | tr -d '\n')
-+    # join with spaces, squeeze repeats, and trim trailing space
-+    $1=$(printf '%s\n' "$result" | tr '\n' ' ' | sed 's/  */ /g; s/ *$//')
-   fi
- ])
-
diff --git a/meta-oe/recipes-connectivity/libtorrent/libtorrent_0.16.1.bb b/meta-oe/recipes-connectivity/libtorrent/libtorrent_0.16.2.bb
similarity index 85%
rename from meta-oe/recipes-connectivity/libtorrent/libtorrent_0.16.1.bb
rename to meta-oe/recipes-connectivity/libtorrent/libtorrent_0.16.2.bb
index 4a8a68aa15..916a70a07b 100644
--- a/meta-oe/recipes-connectivity/libtorrent/libtorrent_0.16.1.bb
+++ b/meta-oe/recipes-connectivity/libtorrent/libtorrent_0.16.2.bb
@@ -6,9 +6,8 @@  LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833"
 
 DEPENDS = "zlib curl libsigc++-2.0 openssl cppunit"
 
-SRC_URI = "git://github.com/rakshasa/libtorrent;branch=master;protocol=https;tag=v${PV} \
-		   file://0001-scripts-common.m4-Insert-spaces-in-shell-lists.patch"
-SRCREV = "919d23923ad0a483fa24441093eda1c12cea4c0b"
+SRC_URI = "git://github.com/rakshasa/libtorrent;branch=master;protocol=https;tag=v${PV}"
+SRCREV = "bd9c66338d9d33b92db9939abb3e0c5d0dace511"
 
 UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)"