[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[Git][xorg-team/lib/mesa][debian-unstable] d/merge-vulkan-driver-manifests.sh: Remove library_arch from JSON manifests

Title: GitLab

Timo Aaltonen pushed to branch debian-unstable at X Strike Force / lib / mesa

Commits:

  • 06408f21
    by Simon McVittie at 2025-08-28T20:02:50+01:00 
    d/merge-vulkan-driver-manifests.sh: Remove library_arch from JSON manifests

Since 25.2.1 they differ slightly between architectures, having added
a library_arch field. That's the only difference, so for now just
remove it, while a longer-term solution is discussed on mesa/mesa#13745.

Closes: #1110523

1 changed file:

Changes:

  • debian/merge-vulkan-driver-manifests.sh
    ... ... @@ -7,7 +7,8 @@
    7 7 
     #
    8 8 
     # If the JSON manifest describing a Vulkan driver contains for example
    9 9 
     # "library_path": "/usr/lib/x86_64-linux-gnu/libvulkan_lvp.so"
    10 
    -# then replace it with
    10 
    +# "library_arch": "64"
    11 
    +# then replace it with just
    11 12 
     # "library_path": "libvulkan_lvp.so"
    12 13 
     # to get the same content for each architecture, and rename from for example
    13 14 
     # "lvp_icd.x86_64.json"
    ... ... @@ -28,6 +29,7 @@ for file in "$DESTDIR"/usr/share/vulkan/icd.d/*.*.json; do
    28 29 
     	if grep -q 'library_path.*/usr/lib/'"${DEB_HOST_MULTIARCH}"'/lib[^/"]*\.so' "${file}"; then
    29 30 
     		replacement="${file%.*.json}.json"
    30 31 
     		sed -E -e '/library_path/ s,/usr/lib/'"${DEB_HOST_MULTIARCH}"'/(lib[^/"]*\.so),\1,' \
    32 
    +			-e '/library_arch/d' \
    31 33 
     			< "${file}" > "${replacement}"
    32 34 
     		diff -s -u "${file}" "${replacement}" || true
    33 35 
     		rm "${file}"

    • —
    View it on GitLab.
    You're receiving this email because of your account on salsa.debian.org. Manage all notifications · Help Notification message regarding https://salsa.debian.org/xorg-team/lib/mesa/-/commit/06408f210d923c304f512a3ddee8973c488b4963 at 1756449419

    Reply to: