From 9e6ee811dfa92ed6853a6eb94982eaa6af6e9f05 Mon Sep 17 00:00:00 2001 From: Ryan Zoeller Date: Thu, 14 Nov 2024 04:07:51 -0600 Subject: [PATCH] [librtpi] update to 1.0.1 (#42126) --- ...-fix-wait_until-predicate-evaluation.patch | 26 ------------------- ports/librtpi/portfile.cmake | 4 +-- ports/librtpi/vcpkg.json | 3 +-- versions/baseline.json | 4 +-- versions/l-/librtpi.json | 5 ++++ 5 files changed, 9 insertions(+), 33 deletions(-) delete mode 100644 ports/librtpi/condition_variable-fix-wait_until-predicate-evaluation.patch diff --git a/ports/librtpi/condition_variable-fix-wait_until-predicate-evaluation.patch b/ports/librtpi/condition_variable-fix-wait_until-predicate-evaluation.patch deleted file mode 100644 index 77e20feef6..0000000000 --- a/ports/librtpi/condition_variable-fix-wait_until-predicate-evaluation.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 75409d8ec67146e0c245316cb564aed5ffda5041 Mon Sep 17 00:00:00 2001 -From: Ryan Zoeller -Date: Fri, 30 Aug 2024 10:51:27 -0500 -Subject: [PATCH] condition_variable: fix wait_until predicate evaluation - -Signed-off-by: Ryan Zoeller ---- - src/rtpi/condition_variable.hpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/rtpi/condition_variable.hpp b/src/rtpi/condition_variable.hpp -index 9041ab7..6fd82d8 100644 ---- a/src/rtpi/condition_variable.hpp -+++ b/src/rtpi/condition_variable.hpp -@@ -185,7 +185,7 @@ class condition_variable { - const std::chrono::time_point &timeout_time, - Predicate stop_waiting) - { -- while (!stop_waiting) { -+ while (!stop_waiting()) { - if (wait_until(lock, timeout_time) == - cv_status::timeout) - return stop_waiting(); --- -2.43.5 - diff --git a/ports/librtpi/portfile.cmake b/ports/librtpi/portfile.cmake index e405109330..f2baa230ff 100644 --- a/ports/librtpi/portfile.cmake +++ b/ports/librtpi/portfile.cmake @@ -3,10 +3,8 @@ vcpkg_from_gitlab( GITLAB_URL https://gitlab.com REPO linux-rt/librtpi REF "${VERSION}" - SHA512 fb0cdd14f3c94f610fc153154ea09d5cfd7d3def16bdaabf8c2b4e0a8b7fa8ddec4cde6ae0b8726d58ee4a773df5c4f13002e565fb06ad3c8e9731a45122704f + SHA512 2665c32867f498d37daaec68a66f5d226de8c2f29bd57f784fbf33245aa5fc3dc173bb80d948b1b5c2c03798dce3fbd9638a3c0ec3816430ecfc7436cea9566e HEAD_REF main - PATCHES - condition_variable-fix-wait_until-predicate-evaluation.patch ) vcpkg_configure_make( diff --git a/ports/librtpi/vcpkg.json b/ports/librtpi/vcpkg.json index 8735bc25e9..7ace65ac74 100644 --- a/ports/librtpi/vcpkg.json +++ b/ports/librtpi/vcpkg.json @@ -1,7 +1,6 @@ { "name": "librtpi", - "version": "1.0.0", - "port-version": 1, + "version": "1.0.1", "description": "The Real-Time Priority Inheritance Library (librtpi) is intended to bridge the gap between the glibc pthread implementation and a functionally correct priority inheritance for pthread locking primitives, such as pthread_mutex and pthread_condvar.", "homepage": "https://gitlab.com/linux-rt/librtpi", "license": "LGPL-2.1-only", diff --git a/versions/baseline.json b/versions/baseline.json index 291775b5c3..8ccee92bbf 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5053,8 +5053,8 @@ "port-version": 4 }, "librtpi": { - "baseline": "1.0.0", - "port-version": 1 + "baseline": "1.0.1", + "port-version": 0 }, "librttopo": { "baseline": "1.1.0", diff --git a/versions/l-/librtpi.json b/versions/l-/librtpi.json index b23bb4e761..13207a1c84 100644 --- a/versions/l-/librtpi.json +++ b/versions/l-/librtpi.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6920412f6e855f637141ada5747c51c6e799c2e0", + "version": "1.0.1", + "port-version": 0 + }, { "git-tree": "a224c4751a43ecde77210db70bc9f0b233a1b9c0", "version": "1.0.0",