[PATCH] install libEGL* and libGLES* into $libdir/mesa
Install libEGL.so*, libGLESv1_CM.so*, and libGLESv2.so* into $libdir/mesa/
instead of $libdir/ and add symlinks for lib*.so and lib*.so.[12] (but not
lib*.so.[12].*) to $libdir.
This is a preparation for supporting alternative implementations of libEGL
and libGLES (currently only a non-free alternative from NVIDIA exists).
The links in $libdir will be managed by update-alternatives later on and
therefore it is necessary to move the real files (lib*.so.[12].*) out of
$libdir, otherwise ldconfig will happily modify the lib*.so.[12] SONAME
links.
Signed-off-by: Andreas Beckmann <debian@abeckmann.de>
---
debian/libegl1-mesa-dev.install.in | 2 +-
debian/libegl1-mesa-dev.links.in | 1 +
debian/libegl1-mesa.install.in | 2 +-
debian/libegl1-mesa.links.in | 1 +
debian/libgles1-mesa-dev.install.in | 2 +-
debian/libgles1-mesa-dev.links.in | 1 +
debian/libgles1-mesa.install.in | 2 +-
debian/libgles1-mesa.links.in | 1 +
debian/libgles2-mesa-dev.install.in | 2 +-
debian/libgles2-mesa-dev.links.in | 1 +
debian/libgles2-mesa.install.in | 2 +-
debian/libgles2-mesa.links.in | 1 +
12 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/debian/libegl1-mesa-dev.install.in b/debian/libegl1-mesa-dev.install.in
index 3f3094f..5a41338 100644
--- a/debian/libegl1-mesa-dev.install.in
+++ b/debian/libegl1-mesa-dev.install.in
@@ -1,4 +1,4 @@
-dri/usr/lib/${DEB_HOST_MULTIARCH}/libEGL.so usr/lib/${DEB_HOST_MULTIARCH}
+dri/usr/lib/${DEB_HOST_MULTIARCH}/libEGL.so usr/lib/${DEB_HOST_MULTIARCH}/mesa
#dri/usr/lib/${DEB_HOST_MULTIARCH}/libwayland-egl.so usr/lib/${DEB_HOST_MULTIARCH}
dri/usr/include/EGL usr/include
dri/usr/include/KHR usr/include
diff --git a/debian/libegl1-mesa-dev.links.in b/debian/libegl1-mesa-dev.links.in
new file mode 100644
index 0000000..da31542
--- /dev/null
+++ b/debian/libegl1-mesa-dev.links.in
@@ -0,0 +1 @@
+usr/lib/${DEB_HOST_MULTIARCH}/mesa/libEGL.so usr/lib/${DEB_HOST_MULTIARCH}/libEGL.so
diff --git a/debian/libegl1-mesa.install.in b/debian/libegl1-mesa.install.in
index 57d1a21..f6ef698 100644
--- a/debian/libegl1-mesa.install.in
+++ b/debian/libegl1-mesa.install.in
@@ -1 +1 @@
-dri/usr/lib/${DEB_HOST_MULTIARCH}/libEGL.so.1* usr/lib/${DEB_HOST_MULTIARCH}
+dri/usr/lib/${DEB_HOST_MULTIARCH}/libEGL.so.1* usr/lib/${DEB_HOST_MULTIARCH}/mesa
diff --git a/debian/libegl1-mesa.links.in b/debian/libegl1-mesa.links.in
new file mode 100644
index 0000000..537e2c6
--- /dev/null
+++ b/debian/libegl1-mesa.links.in
@@ -0,0 +1 @@
+usr/lib/${DEB_HOST_MULTIARCH}/mesa/libEGL.so.1 usr/lib/${DEB_HOST_MULTIARCH}/libEGL.so.1
diff --git a/debian/libgles1-mesa-dev.install.in b/debian/libgles1-mesa-dev.install.in
index 0485b23..df6458d 100644
--- a/debian/libgles1-mesa-dev.install.in
+++ b/debian/libgles1-mesa-dev.install.in
@@ -1,3 +1,3 @@
-dri/usr/lib/${DEB_HOST_MULTIARCH}/libGLESv1_CM.so usr/lib/${DEB_HOST_MULTIARCH}
+dri/usr/lib/${DEB_HOST_MULTIARCH}/libGLESv1_CM.so usr/lib/${DEB_HOST_MULTIARCH}/mesa
dri/usr/include/GLES usr/include
dri/usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/glesv1_cm.pc usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig
diff --git a/debian/libgles1-mesa-dev.links.in b/debian/libgles1-mesa-dev.links.in
new file mode 100644
index 0000000..3d5288b
--- /dev/null
+++ b/debian/libgles1-mesa-dev.links.in
@@ -0,0 +1 @@
+usr/lib/${DEB_HOST_MULTIARCH}/mesa/libGLESv1_CM.so usr/lib/${DEB_HOST_MULTIARCH}/libGLESv1_CM.so
diff --git a/debian/libgles1-mesa.install.in b/debian/libgles1-mesa.install.in
index 143abd2..aa568d8 100644
--- a/debian/libgles1-mesa.install.in
+++ b/debian/libgles1-mesa.install.in
@@ -1 +1 @@
-dri/usr/lib/${DEB_HOST_MULTIARCH}/libGLESv1_CM.so.1* usr/lib/${DEB_HOST_MULTIARCH}
+dri/usr/lib/${DEB_HOST_MULTIARCH}/libGLESv1_CM.so.1* usr/lib/${DEB_HOST_MULTIARCH}/mesa
diff --git a/debian/libgles1-mesa.links.in b/debian/libgles1-mesa.links.in
new file mode 100644
index 0000000..f6b8d8a
--- /dev/null
+++ b/debian/libgles1-mesa.links.in
@@ -0,0 +1 @@
+usr/lib/${DEB_HOST_MULTIARCH}/mesa/libGLESv1_CM.so.1 usr/lib/${DEB_HOST_MULTIARCH}/libGLESv1_CM.so.1
diff --git a/debian/libgles2-mesa-dev.install.in b/debian/libgles2-mesa-dev.install.in
index ae8fe70..eaae986 100644
--- a/debian/libgles2-mesa-dev.install.in
+++ b/debian/libgles2-mesa-dev.install.in
@@ -1,3 +1,3 @@
-dri/usr/lib/${DEB_HOST_MULTIARCH}/libGLESv2.so usr/lib/${DEB_HOST_MULTIARCH}
+dri/usr/lib/${DEB_HOST_MULTIARCH}/libGLESv2.so usr/lib/${DEB_HOST_MULTIARCH}/mesa
dri/usr/include/GLES2 usr/include
dri/usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/glesv2.pc usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig
diff --git a/debian/libgles2-mesa-dev.links.in b/debian/libgles2-mesa-dev.links.in
new file mode 100644
index 0000000..328ade9
--- /dev/null
+++ b/debian/libgles2-mesa-dev.links.in
@@ -0,0 +1 @@
+usr/lib/${DEB_HOST_MULTIARCH}/mesa/libGLESv2.so usr/lib/${DEB_HOST_MULTIARCH}/libGLESv2.so
diff --git a/debian/libgles2-mesa.install.in b/debian/libgles2-mesa.install.in
index 5867818..8cddff5 100644
--- a/debian/libgles2-mesa.install.in
+++ b/debian/libgles2-mesa.install.in
@@ -1 +1 @@
-dri/usr/lib/${DEB_HOST_MULTIARCH}/libGLESv2.so.2* usr/lib/${DEB_HOST_MULTIARCH}
+dri/usr/lib/${DEB_HOST_MULTIARCH}/libGLESv2.so.2* usr/lib/${DEB_HOST_MULTIARCH}/mesa
diff --git a/debian/libgles2-mesa.links.in b/debian/libgles2-mesa.links.in
new file mode 100644
index 0000000..92dde04
--- /dev/null
+++ b/debian/libgles2-mesa.links.in
@@ -0,0 +1 @@
+usr/lib/${DEB_HOST_MULTIARCH}/mesa/libGLESv2.so.2 usr/lib/${DEB_HOST_MULTIARCH}/libGLESv2.so.2
--
tg: (e57d138..) t/use-libdir-mesa-egl (depends on: t/use-libdir-mesa)
Reply to: