1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123 | From bec30e0b6a107b2fcfb76f6ce28e254f6b3062dd Mon Sep 17 00:00:00 2001
From: Alberto Milone <alberto.milone@canonical.com>
Date: Thu, 14 Jan 2016 17:56:47 +0100
Subject: [PATCH 1/1] Add support for the new libraries in 361
Thanks to Michael Marley and Rico Tzschichholz for the work.
---
debian/templates/nvidia-graphics-drivers.install.in | 1 +
debian/templates/nvidia-graphics-drivers.links.in | 4 ----
debian/templates/nvidia-graphics-drivers.links32.in | 4 ----
debian/templates/nvidia-graphics-drivers.postinst.in | 9 +++++++++
debian/templates/nvidia-graphics-drivers.prerm.in | 4 ++++
5 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/debian/templates/nvidia-graphics-drivers.install.in b/debian/templates/nvidia-graphics-drivers.install.in
index 57a0d26..67e48a8 100644
--- a/debian/templates/nvidia-graphics-drivers.install.in
+++ b/debian/templates/nvidia-graphics-drivers.install.in
@@ -12,6 +12,7 @@ debian/stop-nvidia-persistenced usr/bin
#DIRNAME#/libglx.so.#VERSION# #NVIDIAEXTENSION#
#DIRNAME#/libGL*.so* #PKGLIBDIR#
+#DIRNAME#/libOpenGL*.so* #PKGLIBDIR#
#DIRNAME#/libEGL*.so* #PKGLIBDIR#
#DIRNAME#/libnv*.so* #PKGLIBDIR#
diff --git a/debian/templates/nvidia-graphics-drivers.links.in b/debian/templates/nvidia-graphics-drivers.links.in
index 44fb838..c2c3827 100644
--- a/debian/templates/nvidia-graphics-drivers.links.in
+++ b/debian/templates/nvidia-graphics-drivers.links.in
@@ -1,13 +1,9 @@
-#PKGLIBDIR#/libGL.so.#VERSION# #PKGLIBDIR#/libGL.so.1
#PKGLIBDIR#/libGL.so.1 #PKGLIBDIR#/libGL.so
-#PKGLIBDIR#/libEGL.so.#VERSION# #PKGLIBDIR#/libEGL.so.1
#PKGLIBDIR#/libEGL.so.1 #PKGLIBDIR#/libEGL.so
-#PKGLIBDIR#/libGLESv1_CM.so.#VERSION# #PKGLIBDIR#/libGLESv1_CM.so.1
#PKGLIBDIR#/libGLESv1_CM.so.1 #PKGLIBDIR#/libGLESv1_CM.so
-#PKGLIBDIR#/libGLESv2.so.#VERSION# #PKGLIBDIR#/libGLESv2.so.2
#PKGLIBDIR#/libGLESv2.so.2 #PKGLIBDIR#/libGLESv2.so
#PKGLIBDIR#/libnvidia-cfg.so.#VERSION# #PKGLIBDIR#/libnvidia-cfg.so.1
diff --git a/debian/templates/nvidia-graphics-drivers.links32.in b/debian/templates/nvidia-graphics-drivers.links32.in
index 5b2d0c5..6db3d9c 100644
--- a/debian/templates/nvidia-graphics-drivers.links32.in
+++ b/debian/templates/nvidia-graphics-drivers.links32.in
@@ -1,13 +1,9 @@
-#PKGLIBDIR32#/libGL.so.#VERSION# #PKGLIBDIR32#/libGL.so.1
#PKGLIBDIR32#/libGL.so.1 #PKGLIBDIR32#/libGL.so
-#PKGLIBDIR32#/libEGL.so.#VERSION# #PKGLIBDIR32#/libEGL.so.1
#PKGLIBDIR32#/libEGL.so.1 #PKGLIBDIR32#/libEGL.so
-#PKGLIBDIR32#/libGLESv1_CM.so.#VERSION# #PKGLIBDIR32#/libGLESv1_CM.so.1
#PKGLIBDIR32#/libGLESv1_CM.so.1 #PKGLIBDIR32#/libGLESv1_CM.so
-#PKGLIBDIR32#/libGLESv2.so.#VERSION# #PKGLIBDIR32#/libGLESv2.so.2
#PKGLIBDIR32#/libGLESv2.so.2 #PKGLIBDIR32#/libGLESv2.so
#PKGLIBDIR32#/libnvidia-cfg.so.#VERSION# #PKGLIBDIR32#/libnvidia-cfg.so.1
diff --git a/debian/templates/nvidia-graphics-drivers.postinst.in b/debian/templates/nvidia-graphics-drivers.postinst.in
index 32f5489..fcd9697 100644
--- a/debian/templates/nvidia-graphics-drivers.postinst.in
+++ b/debian/templates/nvidia-graphics-drivers.postinst.in
@@ -154,6 +154,9 @@ case "$1" in
--slave #VDPAUDIR32#/libvdpau_nvidia.so.1 #DEB_HOST_MULTIARCH#_libvdpau_nvidia.so.1_lib32 #PKGVDPAUDIR32#/libvdpau_nvidia.so.1 \
--slave #LIBDIR32#/libvdpau_nvidia.so #DEB_HOST_MULTIARCH#_libvdpau_nvidia.so_lib32 #PKGVDPAUDIR32#/libvdpau_nvidia.so \
--slave #GRUBBLKLISTDIR#/10_proprietary-graphics-drivers #DEB_HOST_MULTIARCH#_grub_fb_blacklist #PKGDATADIR#/#DRIVERNAME#.grub-gfxpayload
+ update-alternatives --force \
+ --install #SYSCONFDIR#/ld.so.conf.d/#DEB_HOST_MULTIARCH#_EGL.conf #DEB_HOST_MULTIARCH#_egl_conf #LDSOCONF# #ALTPRIORITY#
+
# Alternative for PRIME power saving mode
# In this case only intel is enabled and we only need to make
@@ -171,12 +174,16 @@ case "$1" in
--slave #NVIDIASHARE#/nvidia-application-profiles-#VERSION#-key-documentation #DEB_HOST_MULTIARCH#_nvidia_app_profile_keys #PKGDATADIR#/nvidia-application-profiles-#VERSION#-key-documentation \
--slave #SYSCONFDIR#/modprobe.d/nvidia-graphics-drivers.conf #DEB_HOST_MULTIARCH#_nvidia_modconf #PKGLIBCONFDIR#/modprobe.conf \
--slave #GRUBBLKLISTDIR#/10_proprietary-graphics-drivers #DEB_HOST_MULTIARCH#_grub_fb_blacklist #PKGDATADIR#/#DRIVERNAME#.grub-gfxpayload
+ update-alternatives --force \
+ --install #SYSCONFDIR#/ld.so.conf.d/#DEB_HOST_MULTIARCH#_EGL.conf #DEB_HOST_MULTIARCH#_egl_conf #PMLDSOCONF# #PMALTPRIORITY#
if [ "$ARCH" != "armhf" ]; then
# Install just the ld.so.conf.d alternative for the secondary architecture.
# We need only to ensure that any mesa ld.so.conf.d alternative isn't active.
update-alternatives --force \
--install #SYSCONFDIR#/ld.so.conf.d/#OTHER_ARCH#_GL.conf #OTHER_ARCH#_gl_conf #ALTLDSOCONF# #ALTPRIORITY#
+ update-alternatives --force \
+ --install #SYSCONFDIR#/ld.so.conf.d/#OTHER_ARCH#_EGL.conf #OTHER_ARCH#_egl_conf #ALTLDSOCONF# #ALTPRIORITY#
# Install just the ld.so.conf.d alternative for PRIME for the
# secondary architecture.
@@ -184,6 +191,8 @@ case "$1" in
# architecture are not used.
update-alternatives --force \
--install #SYSCONFDIR#/ld.so.conf.d/#OTHER_ARCH#_GL.conf #OTHER_ARCH#_gl_conf #PMALTLDSOCONF# #PMALTPRIORITY#
+ update-alternatives --force \
+ --install #SYSCONFDIR#/ld.so.conf.d/#OTHER_ARCH#_EGL.conf #OTHER_ARCH#_egl_conf #PMALTLDSOCONF# #PMALTPRIORITY#
fi
# Make sure glamoregl is disabled
diff --git a/debian/templates/nvidia-graphics-drivers.prerm.in b/debian/templates/nvidia-graphics-drivers.prerm.in
index 17624ce..8a7d3c2 100644
--- a/debian/templates/nvidia-graphics-drivers.prerm.in
+++ b/debian/templates/nvidia-graphics-drivers.prerm.in
@@ -27,10 +27,14 @@ case "$1" in
remove_dkms_module
update-alternatives --remove #DEB_HOST_MULTIARCH#_gl_conf #LDSOCONF#
+ update-alternatives --remove #DEB_HOST_MULTIARCH#_egl_conf #LDSOCONF#
update-alternatives --remove #OTHER_ARCH#_gl_conf #ALTLDSOCONF#
+ update-alternatives --remove #OTHER_ARCH#_egl_conf #ALTLDSOCONF#
# Remove the alternatives for PRIME
update-alternatives --remove #DEB_HOST_MULTIARCH#_gl_conf #PMLDSOCONF#
+ update-alternatives --remove #DEB_HOST_MULTIARCH#_egl_conf #PMLDSOCONF#
update-alternatives --remove #OTHER_ARCH#_gl_conf #PMALTLDSOCONF#
+ update-alternatives --remove #OTHER_ARCH#_egl_conf #PMALTLDSOCONF#
# Remove the alternative for glamor-egl
update-alternatives --remove glamor_conf #PKGDATADIR#/glamor.conf
--
1.9.1
|