[PATCH] install libGL.so* into $libdir/mesa, add links to $libdir
Install libGL.so* into $libdir/mesa/ instead of $libdir/ and add symlinks
for libGL.so and libGL.so.1 (but not libGL.so.1.*) to $libdir.
This is a preparation for simplifying the usage (aka avoid diversions) of
alternative implementations of libGL (currently only non-free alternatives
from NVIDIA and AMD exist).
The links in $libdir will be managed by update-alternatives later on and
therefore it is necessary to move the real file (libGL.so.1.*) out of
$libdir, otherwise ldconfig will happily modify the libGL.so.1 SONAME link.
Signed-off-by: Andreas Beckmann <debian@abeckmann.de>
---
debian/libgl1-mesa-dev.install.in | 2 +-
debian/libgl1-mesa-dev.links.in | 1 +
debian/libgl1-mesa-glx.install.in | 2 +-
debian/libgl1-mesa-glx.links.in | 1 +
debian/libgl1-mesa-swx11-dev.install.in | 2 +-
debian/libgl1-mesa-swx11-dev.links.in | 1 +
debian/libgl1-mesa-swx11.install.in | 2 +-
debian/libgl1-mesa-swx11.links.in | 1 +
8 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/debian/libgl1-mesa-dev.install.in b/debian/libgl1-mesa-dev.install.in
index d915191..5521ac9 100644
--- a/debian/libgl1-mesa-dev.install.in
+++ b/debian/libgl1-mesa-dev.install.in
@@ -1,2 +1,2 @@
-usr/lib/${DEB_HOST_MULTIARCH}/libGL.so
+usr/lib/${DEB_HOST_MULTIARCH}/libGL.so usr/lib/${DEB_HOST_MULTIARCH}/mesa/
usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/gl.pc
diff --git a/debian/libgl1-mesa-dev.links.in b/debian/libgl1-mesa-dev.links.in
new file mode 100644
index 0000000..3bedd3b
--- /dev/null
+++ b/debian/libgl1-mesa-dev.links.in
@@ -0,0 +1 @@
+usr/lib/${DEB_HOST_MULTIARCH}/mesa/libGL.so usr/lib/${DEB_HOST_MULTIARCH}/libGL.so
diff --git a/debian/libgl1-mesa-glx.install.in b/debian/libgl1-mesa-glx.install.in
index f5ffd7a..2f5e1ad 100644
--- a/debian/libgl1-mesa-glx.install.in
+++ b/debian/libgl1-mesa-glx.install.in
@@ -1 +1 @@
-dri/usr/lib/${DEB_HOST_MULTIARCH}/libGL.so.* usr/lib/${DEB_HOST_MULTIARCH}
+dri/usr/lib/${DEB_HOST_MULTIARCH}/libGL.so.* usr/lib/${DEB_HOST_MULTIARCH}/mesa/
diff --git a/debian/libgl1-mesa-glx.links.in b/debian/libgl1-mesa-glx.links.in
new file mode 100644
index 0000000..4cc810f
--- /dev/null
+++ b/debian/libgl1-mesa-glx.links.in
@@ -0,0 +1 @@
+usr/lib/${DEB_HOST_MULTIARCH}/mesa/libGL.so.1 usr/lib/${DEB_HOST_MULTIARCH}/libGL.so.1
diff --git a/debian/libgl1-mesa-swx11-dev.install.in b/debian/libgl1-mesa-swx11-dev.install.in
index 8318ac8..73aef2a 100644
--- a/debian/libgl1-mesa-swx11-dev.install.in
+++ b/debian/libgl1-mesa-swx11-dev.install.in
@@ -1,2 +1,2 @@
usr/lib/${DEB_HOST_MULTIARCH}/libGL.a
-usr/lib/${DEB_HOST_MULTIARCH}/libGL.so
+usr/lib/${DEB_HOST_MULTIARCH}/libGL.so usr/lib/${DEB_HOST_MULTIARCH}/mesa/
diff --git a/debian/libgl1-mesa-swx11-dev.links.in b/debian/libgl1-mesa-swx11-dev.links.in
new file mode 100644
index 0000000..3bedd3b
--- /dev/null
+++ b/debian/libgl1-mesa-swx11-dev.links.in
@@ -0,0 +1 @@
+usr/lib/${DEB_HOST_MULTIARCH}/mesa/libGL.so usr/lib/${DEB_HOST_MULTIARCH}/libGL.so
diff --git a/debian/libgl1-mesa-swx11.install.in b/debian/libgl1-mesa-swx11.install.in
index d333e7b..9d89c20 100644
--- a/debian/libgl1-mesa-swx11.install.in
+++ b/debian/libgl1-mesa-swx11.install.in
@@ -1 +1 @@
-usr/lib/${DEB_HOST_MULTIARCH}/libGL.so.*
+usr/lib/${DEB_HOST_MULTIARCH}/libGL.so.* usr/lib/${DEB_HOST_MULTIARCH}/mesa/
diff --git a/debian/libgl1-mesa-swx11.links.in b/debian/libgl1-mesa-swx11.links.in
new file mode 100644
index 0000000..4cc810f
--- /dev/null
+++ b/debian/libgl1-mesa-swx11.links.in
@@ -0,0 +1 @@
+usr/lib/${DEB_HOST_MULTIARCH}/mesa/libGL.so.1 usr/lib/${DEB_HOST_MULTIARCH}/libGL.so.1
--
tg: (63e119d..) t/use-libdir-mesa (depends on: debian-unstable)
Reply to: