Skip to content

{platform,sdk}.bst: rename dri merge-dir

Dor Askayo requested to merge doraskayo/rename-dri-merge-dir into master

Background

The current merge-dirs path for dri is incorrect and contradicts dri.pc as seen in mesa-headers.bst. It also doesn't match the style of the other merged directories.

I didn't open an issue because I couldn't find something that builds against dri.pc and expects to find the dri directory in runtime. Whatever it is, it wouldn't find it in its current location.

I tested this with GlxInfo and weston in desktop-vm.bst and found no regressions.

Directory structure

Before this MR

[📦 org.freedesktop.VulkanInfo ~]$ ls -l /usr/lib/x86_64-linux-gnu/GL/
total 4
drwxr-xr-x 5 nfsnobody nfsnobody 4096 May 25 11:51 default
drwxr-xr-x 3 dor       dor         60 May 25 12:55 glvnd
drwxr-xr-x 3 dor       dor         60 May 25 12:55 lib
drwxr-xr-x 3 dor       dor         60 May 25 12:55 OpenCL
drwxr-xr-x 3 dor       dor         60 May 25 12:55 vulkan
[📦 org.freedesktop.VulkanInfo ~]$ ls -l /usr/lib/x86_64-linux-gnu/GL/default/
total 12
drwxr-xr-x 4 nfsnobody nfsnobody 4096 May 25 11:51 etc
lrwxrwxrwx 1 nfsnobody nfsnobody   11 May 25 11:51 glvnd -> share/glvnd
drwxr-xr-x 8 nfsnobody nfsnobody 4096 Jan  1  1970 lib
lrwxrwxrwx 1 nfsnobody nfsnobody   10 May 25 11:51 OpenCL -> lib/OpenCL
drwxr-xr-x 5 nfsnobody nfsnobody 4096 Jan  1  1970 share
lrwxrwxrwx 1 nfsnobody nfsnobody   10 May 25 11:51 vulkan -> lib/vulkan

After this MR

[📦 org.freedesktop.GlxInfo ~]$ ls -l /usr/lib/x86_64-linux-gnu/GL/
total 4
drwxr-xr-x 5 nfsnobody nfsnobody 4096 May 25 23:07 default
drwxr-xr-x 2 dor       dor        420 May 25 23:08 dri
drwxr-xr-x 3 dor       dor         60 May 25 23:08 glvnd
drwxr-xr-x 3 dor       dor         60 May 25 23:08 OpenCL
drwxr-xr-x 3 dor       dor         60 May 25 23:08 vulkan
[📦 org.freedesktop.GlxInfo ~]$ ls -l /usr/lib/x86_64-linux-gnu/GL/default/
total 12
lrwxrwxrwx 1 nfsnobody nfsnobody    7 May 25 23:07 dri -> lib/dri
drwxr-xr-x 4 nfsnobody nfsnobody 4096 May 25 23:07 etc
lrwxrwxrwx 1 nfsnobody nfsnobody   11 May 25 23:07 glvnd -> share/glvnd
drwxr-xr-x 8 nfsnobody nfsnobody 4096 Jan  1  1970 lib
lrwxrwxrwx 1 nfsnobody nfsnobody   10 May 25 23:07 OpenCL -> lib/OpenCL
drwxr-xr-x 5 nfsnobody nfsnobody 4096 Jan  1  1970 share
lrwxrwxrwx 1 nfsnobody nfsnobody   10 May 25 23:07 vulkan -> lib/vulkan
Edited by Dor Askayo

Merge request reports