From 2bad42ecb1271a52203f585b970e13466c2cddb1 Mon Sep 17 00:00:00 2001
From: soiamsoNG <soiamsoNG@users.noreply.github.com>
Date: Sat, 23 Mar 2024 22:26:25 +0800
Subject: [PATCH 1/2] Update 99-platformio-udev.rules (#4880)

Fix typo
---
 platformio/assets/system/99-platformio-udev.rules | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platformio/assets/system/99-platformio-udev.rules b/platformio/assets/system/99-platformio-udev.rules
index d17569e7..08817377 100644
--- a/platformio/assets/system/99-platformio-udev.rules
+++ b/platformio/assets/system/99-platformio-udev.rules
@@ -177,4 +177,4 @@ ATTRS{product}=="*CMSIS-DAP*", MODE="0666", ENV{ID_MM_DEVICE_IGNORE}="1", ENV{ID
 ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="2107", MODE="0666", ENV{ID_MM_DEVICE_IGNORE}="1", ENV{ID_MM_PORT_IGNORE}="1"
 
 # Espressif USB JTAG/serial debug unit
-ATTRS{idVendor}=="303a", ATTR{idProduct}=="1001", MODE="0666", ENV{ID_MM_DEVICE_IGNORE}="1", ENV{ID_MM_PORT_IGNORE}="1"
+ATTRS{idVendor}=="303a", ATTRS{idProduct}=="1001", MODE="0666", ENV{ID_MM_DEVICE_IGNORE}="1", ENV{ID_MM_PORT_IGNORE}="1"

From c475578db698fe2828b5a602af08d4e062145137 Mon Sep 17 00:00:00 2001
From: Ivan Kravets <me@ikravets.com>
Date: Tue, 26 Mar 2024 13:44:26 +0200
Subject: [PATCH 2/2] Resolved an issue where the |LDF| couldn't locate a
 library dependency declared via version control system repository // Resolve
 #4885

---
 HISTORY.rst                        |  5 +++++
 platformio/builder/tools/piolib.py | 16 ++++++++++++----
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/HISTORY.rst b/HISTORY.rst
index 6c83cbb5..4013392e 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -18,6 +18,11 @@ Unlock the true potential of embedded software development with
 PlatformIO's collaborative ecosystem, embracing declarative principles,
 test-driven methodologies, and modern toolchains for unrivaled success.
 
+6.1.15 (2024-??-??)
+~~~~~~~~~~~~~~~~~~~
+
+* Resolved an issue where the |LDF| couldn't locate a library dependency declared via version control system repository (`issue #4885 <https://github.com/platformio/platformio-core/issues/4885>`_)
+
 6.1.14 (2024-03-21)
 ~~~~~~~~~~~~~~~~~~~
 
diff --git a/platformio/builder/tools/piolib.py b/platformio/builder/tools/piolib.py
index d970344e..ca9c9f1e 100644
--- a/platformio/builder/tools/piolib.py
+++ b/platformio/builder/tools/piolib.py
@@ -39,7 +39,7 @@ from platformio.package.manifest.parser import (
     ManifestParserError,
     ManifestParserFactory,
 )
-from platformio.package.meta import PackageCompatibility, PackageItem
+from platformio.package.meta import PackageCompatibility, PackageItem, PackageSpec
 from platformio.project.options import ProjectOptions
 
 
@@ -332,9 +332,17 @@ class LibBuilderBase:
             qualifiers = {"name": pkg.metadata.name, "version": pkg.metadata.version}
             if pkg.metadata.spec and pkg.metadata.spec.owner:
                 qualifiers["owner"] = pkg.metadata.spec.owner
-        return PackageCompatibility.from_dependency(
-            {k: v for k, v in dependency.items() if k in ("owner", "name", "version")}
-        ).is_compatible(PackageCompatibility(**qualifiers))
+        dep_qualifiers = {
+            k: v for k, v in dependency.items() if k in ("owner", "name", "version")
+        }
+        if (
+            "version" in dep_qualifiers
+            and not PackageSpec(dep_qualifiers["version"]).requirements
+        ):
+            del dep_qualifiers["version"]
+        return PackageCompatibility.from_dependency(dep_qualifiers).is_compatible(
+            PackageCompatibility(**qualifiers)
+        )
 
     def get_search_files(self):
         return [