Use dependency_names for upstreams that call override_dependency()

bgilbert · neheb · commit b891b3b88c2b · 2025-08-30T15:01:02.000-07:00
diff --git a/subprojects/cglm.wrap b/subprojects/cglm.wrap
@@ -5,4 +5,4 @@ source_filename = cglm-0.9.6.tar.gz
 source_hash = be5e7d384561eb0fca59724a92b7fb44bf03e588a7eae5123a7d796002928184
 
 [provide]
-cglm = cglm_dep
+dependency_names = cglm
diff --git a/subprojects/cpp-httplib.wrap b/subprojects/cpp-httplib.wrap
@@ -5,4 +5,4 @@ source_filename = cpp-httplib-0.25.0.tar.gz
 source_hash = ac7c59fa72325d4cb9f73af266312d82632ac35a5c4c8a1be620c1f946ec9cea
 
 [provide]
-cpp-httplib = cpp_httplib_dep
+dependency_names = cpp-httplib
diff --git a/subprojects/fribidi.wrap b/subprojects/fribidi.wrap
@@ -6,4 +6,4 @@ source_filename = fribidi-1.0.16.tar.xz
 source_hash = 1b1cde5b235d40479e91be2f0e88a309e3214c8ab470ec8a2744d82a5a9ea05c
 
 [provide]
-fribidi = libfribidi_dep
+dependency_names = fribidi
diff --git a/subprojects/gdk-pixbuf.wrap b/subprojects/gdk-pixbuf.wrap
@@ -5,4 +5,4 @@ source_filename = gdk-pixbuf-2.42.12.tar.xz
 source_hash = b9505b3445b9a7e48ced34760c3bcb73e966df3ac94c95a148cb669ab748e3c7
 
 [provide]
-gdk-pixbuf-2.0 = gdkpixbuf_dep
+dependency_names = gdk-pixbuf-2.0
diff --git a/subprojects/kraken-engine.wrap b/subprojects/kraken-engine.wrap
@@ -5,4 +5,4 @@ source_filename = Kraken-Engine-0.0.11.tar.gz
 source_hash = 1c2d84ebaa6c04d0e22d76fccbbb10f09a2849813949d4cba4527c4e0c06bbbb
 
 [provide]
-kraken-engine = kraken_engine_dep
+dependency_names = kraken-engine
diff --git a/subprojects/libdrm.wrap b/subprojects/libdrm.wrap
@@ -5,13 +5,4 @@ source_filename = libdrm-2.4.125.tar.xz
 source_hash = d4bae92797a50f81a93524762e0410a49cd84cfa0f997795bc0172ac8fb1d96a
 
 [provide]
-libdrm = ext_libdrm
-libdrm_amdgpu = ext_libdrm_amdgpu
-libdrm_etnaviv = ext_libdrm_etnaviv
-libdrm_exynos = ext_libdrm_exynos
-libdrm_freedreno = ext_libdrm_freedreno
-libdrm_intel = ext_libdrm_intel
-libdrm_nouveau = ext_libdrm_nouveau
-libdrm_omap = ext_libdrm_omap
-libdrm_radeon = ext_libdrm_radeon
-libdrm_tegra = ext_libdrm_tegra
+dependency_names = libdrm, libdrm_amdgpu, libdrm_etnaviv, libdrm_exynos, libdrm_freedreno, libdrm_intel, libdrm_nouveau, libdrm_omap, libdrm_radeon, libdrm_tegra
diff --git a/subprojects/libliftoff.wrap b/subprojects/libliftoff.wrap
@@ -5,4 +5,4 @@ source_filename = libliftoff-v0.5.0.tar.gz
 source_hash = 3309218c3137a70faada653690802b514e4e46d9b38e7d9d5948ffcc4831f3b1
 
 [provide]
-libliftoff = liftoff
+dependency_names = libliftoff
diff --git a/subprojects/libxml2.wrap b/subprojects/libxml2.wrap
@@ -6,4 +6,4 @@ source_filename = libxml2-2.14.5.tar.xz
 source_hash = 03d006f3537616833c16c53addcdc32a0eb20e55443cba4038307e3fa7d8d44b
 
 [provide]
-libxml-2.0 = xml_dep
+dependency_names = libxml-2.0
diff --git a/subprojects/pciaccess.wrap b/subprojects/pciaccess.wrap
@@ -5,4 +5,4 @@ source_filename = libpciaccess-0.18.1.tar.xz
 source_hash = 4af43444b38adb5545d0ed1c2ce46d9608cc47b31c2387fc5181656765a6fa76
 
 [provide]
-pciaccess = dep_pciaccess
+dependency_names = pciaccess
diff --git a/subprojects/pixman.wrap b/subprojects/pixman.wrap
@@ -6,4 +6,4 @@ source_filename = pixman-0.46.4.tar.gz
 source_hash = d09c44ebc3bd5bee7021c79f922fe8fb2fb57f7320f55e97ff9914d2346a591c
 
 [provide]
-pixman-1 = idep_pixman
+dependency_names = pixman-1
diff --git a/subprojects/pkgconf.wrap b/subprojects/pkgconf.wrap
@@ -5,4 +5,4 @@ source_filename = pkgconf-2.5.1.tar.xz
 source_hash = cd05c9589b9f86ecf044c10a2269822bc9eb001eced2582cfffd658b0a50c243
 
 [provide]
-libpkgconf = dep_libpkgconf
+dependency_names = libpkgconf
diff --git a/subprojects/qarchive.wrap b/subprojects/qarchive.wrap
@@ -5,4 +5,4 @@ source_filename = QArchive-2.2.7.tar.gz
 source_hash = 53bc9633e4e75d01d7ae6ff925fd111fc4951f922f74b37d652df51c0eb4aa30
 
 [provide]
-qarchive = qarchive_dep
+dependency_names = qarchive
diff --git a/subprojects/slirp.wrap b/subprojects/slirp.wrap
@@ -5,6 +5,5 @@ source_fallback_url = https://mirror.rackspace.com/gentoo/distfiles/libslirp-4.9
 source_filename = libslirp-v4.9.1.tar.gz
 source_hash = 3970542143b7c11e6a09a4d2b50f30a133473c41f15ed0bdcc3b7a1c450d9a5c
 
-# the libslirp project uses a pkg-config name of slirp instead of libslirp
 [provide]
-slirp = libslirp_libdep
+dependency_names = slirp
diff --git a/subprojects/snitch.wrap b/subprojects/snitch.wrap
@@ -5,5 +5,4 @@ source_filename = snitch-1.3.2.tar.gz
 source_hash = 5b3a0af7e5637f02ac95652f2238b89eb227b4881bf4e5ffc6935f184ff11626
 
 [provide]
-snitch = snitch_dep
-
+dependency_names = snitch
diff --git a/subprojects/spng.wrap b/subprojects/spng.wrap
@@ -6,4 +6,4 @@ source_filename = libspng-0.7.4.tar.gz
 source_hash = 47ec02be6c0a6323044600a9221b049f63e1953faf816903e7383d4dc4234487
 
 [provide]
-spng = spng_dep
+dependency_names = spng
diff --git a/subprojects/tinyxml2.wrap b/subprojects/tinyxml2.wrap
@@ -5,4 +5,4 @@ source_filename = tinyxml2-11.0.0.tar.gz
 source_hash = 5556deb5081fb246ee92afae73efd943c889cef0cafea92b0b82422d6a18f289
 
 [provide]
-tinyxml2 = dep_tinyxml2
+dependency_names = tinyxml2
diff --git a/subprojects/tracy.wrap b/subprojects/tracy.wrap
@@ -1,9 +1,8 @@
 [wrap-file]
 directory = tracy-0.12.2
-
 source_url = https://github.com/wolfpld/tracy/archive/refs/tags/v0.12.2.tar.gz
 source_filename = tracy-0.12.2.tar.gz
 source_hash = 09617765ba5ff1aa6da128d9ba3c608166c5ef05ac28e2bb77f791269d444952
 
 [provide]
-tracy = tracy_dep
+dependency_names = tracy
diff --git a/subprojects/wayland-protocols.wrap b/subprojects/wayland-protocols.wrap
@@ -5,4 +5,4 @@ source_filename = wayland-protocols-1.45.tar.xz
 source_hash = 4d2b2a9e3e099d017dc8107bf1c334d27bb87d9e4aff19a0c8d856d17cd41ef0
 
 [provide]
-wayland-protocols = wayland_protocols
+dependency_names = wayland-protocols
