Package: release.debian.org
Severity: normal
Tags: stretch
User: release.debian....@packages.debian.org
Usertags: pu
Hi,
for updating nvidia-graphics-drivers in stable to a new upstream release
we also need to upgrade the glx-alternatives support package because of
nvidia having renamed the glvnd stub libraries (which is a good thing,
also done upstream in src:libglvnd in sid). We just need to be aware of
the new names ...
There are also a few bugfixes that happened since 0.7.4 in stretch.
The debhelper bump was reverted.
I filtered the deletion of all files needed for glx-alternative-fglrx -
that package was already not built in stretch and now all traces of it are
gone.
The proposed package is also available (with minor differences) in
stretch-backports, since libglvnd got backported.
Andreas
diff --git a/debian/bug-control b/debian/bug-control
index f5a6e7d..de054a7 100644
--- a/debian/bug-control
+++ b/debian/bug-control
@@ -1,3 +1,3 @@
-report-with: glx-diversions nvidia-glx fglrx-driver
+report-with: glx-diversions nvidia-driver
-package-status: glx-alternative-mesa glx-alternative-nvidia
glx-alternative-fglrx libgl1 libgl1-dev nvidia-glx-any libgl1-nvidia-glx-any
xserver-xorg-video-nvidia-any
+package-status: glx-alternative-mesa glx-alternative-nvidia libgl1 libgl1-dev
nvidia-glx-any libgl1-nvidia-glx-any xserver-xorg-video-nvidia-any
diff --git a/debian/bug-script b/debian/bug-script
index 3b7bd05..893dcf4 100644
--- a/debian/bug-script
+++ b/debian/bug-script
@@ -10,7 +10,6 @@ echo
ls -la /usr/lib/mesa-diverted \
/usr/lib/mesa-diverted/*-linux-gnu/ \
/usr/lib/nvidia/diversions \
- /usr/lib/fglrx/diversions \
2>/dev/null
echo
diff --git a/debian/changelog b/debian/changelog
index 29d4632..985bddc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,61 @@
+glx-alternatives (0.8.3~deb9u1) stretch; urgency=medium
+
+ * Rebuild for stretch.
+ * Revert to debhelper compat level 9.
+
+ -- Andreas Beckmann <a...@debian.org> Tue, 03 Apr 2018 21:18:58 +0200
+
+glx-alternatives (0.8.3) unstable; urgency=medium
+
+ * Divert libGL.so.1.7.0, libGLESv1_CM.so.1.2.0, libGLESv2.so.2.1.0,
+ libEGL.so.1.1.0 that will be used by the next libglvnd upstream release.
+ * Update validation of the diverted libGL.so.1 symlink. (Closes: #879041)
+
+ -- Andreas Beckmann <a...@debian.org> Fri, 02 Feb 2018 01:57:38 +0100
+
+glx-alternatives (0.8.2) unstable; urgency=medium
+
+ * Remove support for MESA libraries in /usr/lib/<triplet>/mesa/, the libs
+ never moved there.
+ * Remove support for libGLcore.so.1 and libnvidia-tls.so.1 alternatives,
+ only needed for 173xx and older legacy drivers.
+ * glx-alternative-nvidia: Provide the libnvidia-cfg.so.1 alternative for
+ bumblebee and cuda-only users. (Closes: #888461)
+ * Bump Standards-Version to 4.1.3. No changes needed.
+ * Switch to debhelper compat level 11.
+ * Switch Vcs-* URLs to salsa.debian.org.
+
+ -- Andreas Beckmann <a...@debian.org> Fri, 26 Jan 2018 21:51:10 +0100
+
+glx-alternatives (0.8.1) unstable; urgency=medium
+
+ [ Andreas Beckmann ]
+ * Bump Standards-Version to 4.1.1. No changes needed.
+ * Set Rules-Requires-Root: no.
+ * Refresh debian/copyright from dh_make templates.
+
+ [ Russ Allbery ]
+ * Remove myself from Uploaders.
+
+ -- Andreas Beckmann <a...@debian.org> Fri, 17 Nov 2017 06:00:23 +0100
+
+glx-alternatives (0.8.0) unstable; urgency=medium
+
+ [ Andreas Beckmann ]
+ * glx-diversions: Divert libGL.so.1.0.0 as shipped by libgl1 from
+ src:libglvnd.
+ * glx-alternative-nvidia: Preliminary support for libGL.so.1 from libglvnd.
+ * Use explicit interest-await triggers.
+ * Drop glx-alternative-fglrx.
+ * Switch to debhelper compat level 10.
+ * Bump Standards-Version to 4.0.1. No changes needed.
+ * Update Lintian overrides.
+
+ [ Luca Boccassi ]
+ * Add manpage for update-glx.
+
+ -- Andreas Beckmann <a...@debian.org> Sun, 13 Aug 2017 07:51:40 +0200
+
glx-alternatives (0.7.4) unstable; urgency=medium
* glx-alternative-nvidia: Bump some Breaks to account for newer
diff --git a/debian/control b/debian/control
index 30191a2..316d36f 100644
--- a/debian/control
+++ b/debian/control
@@ -3,18 +3,21 @@ Section: contrib/libs
Priority: optional
Maintainer: Debian NVIDIA Maintainers
<pkg-nvidia-de...@lists.alioth.debian.org>
Uploaders:
- Russ Allbery <r...@debian.org>,
Andreas Beckmann <a...@debian.org>,
-Vcs-Git: https://anonscm.debian.org/git/pkg-nvidia/glx-alternatives.git
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-nvidia/glx-alternatives.git
Build-Depends:
debhelper (>= 9),
-Standards-Version: 3.9.8
+Rules-Requires-Root: no
+Standards-Version: 4.1.3
+Vcs-Browser: https://salsa.debian.org/nvidia-team/glx-alternatives
+Vcs-Git: https://salsa.debian.org/nvidia-team/glx-alternatives.git
Package: update-glx
Section: contrib/x11
Architecture: i386 amd64 armhf
Multi-Arch: foreign
+Pre-Depends:
+ dpkg (>= 1.17.21),
+ ${misc:Pre-Depends}
Depends:
${misc:Depends}
Description: utility for switching the GLX implementation
@@ -47,6 +50,9 @@ Description: prepare for using accelerated GLX
implementations from GPU vendors
Package: glx-alternative-mesa
Architecture: i386 amd64 armhf
Multi-Arch: foreign
+Pre-Depends:
+ dpkg (>= 1.17.21),
+ ${misc:Pre-Depends}
Depends:
update-glx (= ${binary:Version}),
${misc:Depends}
@@ -68,6 +74,9 @@ Description: allows the selection of MESA as GLX provider
Package: glx-alternative-nvidia
Architecture: i386 amd64 armhf
Multi-Arch: foreign
+Pre-Depends:
+ dpkg (>= 1.17.21),
+ ${misc:Pre-Depends}
Depends:
update-glx (= ${binary:Version}),
glx-diversions (= ${binary:Version}),
@@ -82,6 +91,11 @@ Breaks:
nvidia-alternative (<< 352.55),
nvidia-legacy-340xx-alternative (<< 340.93-2~),
nvidia-legacy-304xx-alternative (<< 304.132-1~),
+# ancient drivers
+#nvidia-alternative (<< 304),
+ nvidia-alternative-legacy-173xx (<< 304),
+ nvidia-alternative-legacy-96xx (<< 304),
+ nvidia-alternative-legacy-71xx (<< 304),
Description: allows the selection of NVIDIA as GLX provider
In setups with several GLX providers (e.g. the free MESA implementation and
proprietary graphics hardware vendor implementations) this metapackage
@@ -92,24 +106,3 @@ Description: allows the selection of NVIDIA as GLX provider
This package does not depend on the corresponding NVIDIA libraries.
In order to install the NVIDIA driver and libraries, install the
nvidia-driver package instead.
-
-#Package: glx-alternative-fglrx
-#Architecture: i386 amd64
-#Multi-Arch: foreign
-#Depends:
-# update-glx (= ${binary:Version}),
-# glx-diversions (= ${binary:Version}),
-# glx-alternative-mesa,
-# ${misc:Depends}
-#Suggests:
-# fglrx-driver,
-#Description: allows the selection of FGLRX as GLX provider
-# In setups with several GLX providers (e.g. the free MESA implementation and
-# proprietary graphics hardware vendor implementations) this metapackage
-# allows one to switch to the non-free FGLRX driver and libraries.
-# .
-# Use 'update-glx --config glx' to select an implementation.
-# .
-# This package does not depend on the corresponding FGLRX libraries.
-# In order to install the FGLRX driver and libraries, install the fglrx-glx and
-# fglrx-driver packages instead.
diff --git a/debian/copyright b/debian/copyright
index 75dd6a8..388ccdc 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,4 +1,4 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Disclaimer:
This package is not part of the GNU/Linux Debian distribution since it
exists only to support non-free accelerated graphics drivers.
@@ -6,8 +6,20 @@ Disclaimer:
GNU GPL version 2 or later.
Files: *
-Copyright: © 2010-2016 Andreas Beckmann <a...@debian.org>
-License: GPL-2+
- The Debian packaging is released under the GNU GPL version 2 or later.
- The text of the license is available in /usr/share/common-licenses/GPL-2
- on Debian systems.
+Copyright: © 2010-2018 Andreas Beckmann <a...@debian.org>
+License: GPL-2.0+
+ This package is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+ .
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <https://www.gnu.org/licenses/>
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
diff --git a/debian/gbp.conf b/debian/gbp.conf
new file mode 100644
index 0000000..3bf5b64
--- /dev/null
+++ b/debian/gbp.conf
@@ -0,0 +1,2 @@
+[DEFAULT]
+debian-branch = stretch
diff --git a/debian/glx-alternative-fglrx.dirs
b/debian/glx-alternative-fglrx.dirs
deleted file mode 100644
index 7ac71c8..0000000
diff --git a/debian/glx-alternative-fglrx.install
b/debian/glx-alternative-fglrx.install
deleted file mode 100644
index 37de1c0..0000000
diff --git a/debian/glx-alternative-fglrx.lintian-overrides
b/debian/glx-alternative-fglrx.lintian-overrides
deleted file mode 100644
index 5fe0537..0000000
diff --git a/debian/glx-alternative-fglrx.maintscript
b/debian/glx-alternative-fglrx.maintscript
deleted file mode 100644
index 163c955..0000000
diff --git a/debian/glx-alternative-fglrx.postinst
b/debian/glx-alternative-fglrx.postinst
deleted file mode 100644
index 824dbf3..0000000
diff --git a/debian/glx-alternative-fglrx.prerm
b/debian/glx-alternative-fglrx.prerm
deleted file mode 100644
index ef44071..0000000
diff --git a/debian/glx-alternative-fglrx.triggers
b/debian/glx-alternative-fglrx.triggers
deleted file mode 100644
index eba9689..0000000
diff --git a/debian/glx-alternative-mesa.postinst
b/debian/glx-alternative-mesa.postinst
index 0eff49a..9625595 100644
--- a/debian/glx-alternative-mesa.postinst
+++ b/debian/glx-alternative-mesa.postinst
@@ -43,18 +43,9 @@ add_multiarch_slave()
# * /usr/lib[/<triplet>]/libGL.so.1
setup_alternatives()
{
- # libGL.so.1 (from /usr/lib[/triplet]/mesa/)
- slaves="$(add_multiarch_slave /usr/lib "" libGL.so.1 /usr/lib mesa/)
- $(add_multiarch_slave /usr/lib "" libEGL.so.1 /usr/lib mesa/)
- $(add_multiarch_slave /usr/lib "" libGLESv1_CM.so.1 /usr/lib
mesa/)
- $(add_multiarch_slave /usr/lib "" libGLESv2.so.2 /usr/lib mesa/)
-"
-
- if echo "$slaves" | grep -q "slave" ; then
- update-alternatives --install /usr/lib/glx glx /usr/lib/mesa 6
$slaves
- else
- update-alternatives --remove glx /usr/lib/mesa
- fi
+ # these were never used
+ update-alternatives --remove libGL.so-master /usr/lib/mesa
+ update-alternatives --remove glx /usr/lib/mesa
# libGL.so.1 (from /usr/lib/mesa-diverted/)
slaves="$(add_multiarch_slave /usr/lib "" libGL.so.1
/usr/lib/mesa-diverted)
@@ -69,19 +60,6 @@ setup_alternatives()
update-alternatives --remove glx /usr/lib/mesa-diverted
fi
- # libGL.so (from /usr/lib[/triplet]/mesa/)
- slaves="$(add_multiarch_slave /usr/lib "" libGL.so /usr/lib mesa/)
- $(add_multiarch_slave /usr/lib "" libEGL.so /usr/lib mesa/)
- $(add_multiarch_slave /usr/lib "" libGLESv1_CM.so /usr/lib
mesa/)
- $(add_multiarch_slave /usr/lib "" libGLESv2.so /usr/lib mesa/)
-"
-
- if echo "$slaves" | grep -q "slave" ; then
- update-alternatives --install
/usr/lib/mesa-diverted/libGL.so-master libGL.so-master /usr/lib/mesa 9996
$slaves
- else
- update-alternatives --remove libGL.so-master /usr/lib/mesa
- fi
-
# libGL.so (from /usr/lib/mesa-diverted/)
slaves="$(add_multiarch_slave /usr/lib "" libGL.so
/usr/lib/mesa-diverted)
$(add_multiarch_slave /usr/lib "" libEGL.so
/usr/lib/mesa-diverted)
diff --git a/debian/glx-alternative-mesa.prerm
b/debian/glx-alternative-mesa.prerm
index 8957413..000bd89 100644
--- a/debian/glx-alternative-mesa.prerm
+++ b/debian/glx-alternative-mesa.prerm
@@ -7,9 +7,6 @@ if [ "$1" = "remove" ] || [ "$1" = "deconfigure" ]; then
update-alternatives --remove libGL.so-master /usr/lib/mesa-diverted
update-alternatives --remove glx /usr/lib/mesa-diverted
- update-alternatives --remove libGL.so-master /usr/lib/mesa
- update-alternatives --remove glx /usr/lib/mesa
-
fi
diff --git a/debian/glx-alternative-mesa.triggers.sh
b/debian/glx-alternative-mesa.triggers.sh
index acd9711..1fe5fc7 100644
--- a/debian/glx-alternative-mesa.triggers.sh
+++ b/debian/glx-alternative-mesa.triggers.sh
@@ -1,7 +1,7 @@
#!/bin/sh
set -e
-echo "interest register-glx-alternative-mesa"
+echo "interest-await register-glx-alternative-mesa"
echo
TRIPLETS="/ /i386-linux-gnu/ /x86_64-linux-gnu/ /arm-linux-gnueabihf/"
@@ -11,9 +11,8 @@ SOLINKS="libGL.so libEGL.so libGLESv1_CM.so libGLESv2.so"
for lib in $SOLINKS $LIBS
do
for triplet in $TRIPLETS ; do
- echo "interest /usr/lib${triplet}$lib"
- echo "interest /usr/lib${triplet}mesa/$lib"
- echo "interest /usr/lib/mesa-diverted${triplet}$lib"
+ echo "interest-await /usr/lib${triplet}$lib"
+ echo "interest-await /usr/lib/mesa-diverted${triplet}$lib"
echo
done
echo
diff --git a/debian/glx-alternative-nvidia.postinst
b/debian/glx-alternative-nvidia.postinst
index f223bf4..59cc916 100644
--- a/debian/glx-alternative-nvidia.postinst
+++ b/debian/glx-alternative-nvidia.postinst
@@ -49,23 +49,20 @@ add_multiarch_slave()
done
}
-# try to find $library in $vendor, mesa, mesa-diverted
+# try to find $library in $vendor, mesa-diverted
search_multiarch_slave()
{
local library vendor s
library="$1"
vendor="$2"
+ if [ -n "$vendor" ]; then
s="$(add_multiarch_slave /usr/lib "" $library /usr/lib $vendor/)"
if echo "$s" | grep -q "slave" ; then
echo "$s"
return
fi
- s="$(add_multiarch_slave /usr/lib "" $library /usr/lib mesa/)"
- if echo "$s" | grep -q "slave" ; then
- echo "$s"
- return
- fi
+ fi
s="$(add_multiarch_slave /usr/lib "" $library /usr/lib/mesa-diverted)"
echo "$s"
}
@@ -73,7 +70,7 @@ search_multiarch_slave()
# Handles the alternatives for
# * /usr/lib[/<triplet>]/libGL.so.1
# * /usr/lib/xorg/modules/linux/libglx.so
-# * /usr/lib/xorg/modules/drivers/nvidia_drv.so
+# * /usr/lib/xorg/modules/drivers/nvidia_drv.so
# * several more NVIDIA libraries etc.
# * /etc/modprobe.d/nvidia-blacklists-nouveau.conf
# * /etc/modprobe.d/nvidia.conf
@@ -83,6 +80,7 @@ setup_alternatives()
{
libGL_nvidia_enabler="
$(add_multiarch_slave /usr/lib "" libGL.so.1 /usr/lib nvidia/)
+ $(add_multiarch_slave /usr/lib "" libGLX_nvidia.so.0 /usr/lib
"")
"
xorg_enabler="
$(add_slave /usr/lib/xorg/modules/drivers/nvidia_drv.so
nvidia_drv.so /usr/lib/nvidia/nvidia_drv.so)
@@ -91,11 +89,7 @@ setup_alternatives()
$(add_multiarch_slave /usr/lib "" libcuda.so /usr/lib)
"
libGL_nvidia_slaves="
- $libGL_nvidia_enabler
- $(add_multiarch_slave /usr/lib "" libGLcore.so.1 /usr/lib
nvidia/)
- $(add_multiarch_slave /usr/lib "" libnvidia-cfg.so.1 /usr/lib
nvidia/)
- $(add_multiarch_slave /usr/lib "" libnvidia-tls.so.1 /usr/lib
nvidia/)
- $(add_multiarch_slave /usr/lib tls/ libnvidia-tls.so.1 /usr/lib
nvidia/tls/ tls-)
+ $(search_multiarch_slave libGL.so.1 nvidia)
$(add_multiarch_slave /usr/lib "" libXvMCNVIDIA.so.1 /usr/lib
nvidia/)
$(add_multiarch_slave /usr/lib "" libXvMCNVIDIA_dynamic.so.1
/usr/lib nvidia/)
"
@@ -105,12 +99,12 @@ setup_alternatives()
$(search_multiarch_slave libGLESv2.so.2 nvidia)
"
libGL_mesa_slaves="
- $(search_multiarch_slave libGL.so.1 mesa)
+ $(search_multiarch_slave libGL.so.1)
"
libEGL_mesa_slaves="
- $(search_multiarch_slave libEGL.so.1 mesa)
- $(search_multiarch_slave libGLESv1_CM.so.1 mesa)
- $(search_multiarch_slave libGLESv2.so.2 mesa)
+ $(search_multiarch_slave libEGL.so.1)
+ $(search_multiarch_slave libGLESv1_CM.so.1)
+ $(search_multiarch_slave libGLESv2.so.2)
"
xorg_slaves="
$xorg_enabler
@@ -131,6 +125,7 @@ setup_alternatives()
$(add_slave /etc/modules-load.d/nvidia.conf nvidia-load.conf
/etc/nvidia/nvidia-load.conf)
"
misc_slaves="
+ $(add_multiarch_slave /usr/lib "" libnvidia-cfg.so.1 /usr/lib
nvidia/)
$(add_slave /usr/bin/nvidia-bug-report.sh nvidia-bug-report.sh
/usr/lib/nvidia/nvidia-bug-report.sh)
"
diff --git a/debian/glx-alternative-nvidia.triggers
b/debian/glx-alternative-nvidia.triggers
index 7439deb..85cb0f2 100644
--- a/debian/glx-alternative-nvidia.triggers
+++ b/debian/glx-alternative-nvidia.triggers
@@ -1,2 +1,2 @@
-interest register-glx-alternative-nvidia
-interest register-glx-alternative-nvidia--pong
+interest-await register-glx-alternative-nvidia
+interest-await register-glx-alternative-nvidia--pong
diff --git a/debian/glx-diversions.README.Debian
b/debian/glx-diversions.README.Debian
index 860a8a8..217c4e1 100644
--- a/debian/glx-diversions.README.Debian
+++ b/debian/glx-diversions.README.Debian
@@ -24,8 +24,7 @@ term.log.1.* etc. Root access is required to read or copy
these logfiles.
Short summary about selecting a glx implementation
==================================================
-To switch between the GLX implementation from MESA, NVIDIA and AMD(fglrx),
-run
+To switch between the GLX implementation from MESA and NVIDIA, run
update-glx --config glx
@@ -63,13 +62,13 @@ Therefore we changed this in the following way:
- To activate an implementation (and to allow easy switching between them)
an alternative "glx" is being registered with slave alternatives for all
the libraries, modules and other files of that implementation. This is
- handled by the glx-alternative-{mesa,nvidia,fglrx} packages.
+ handled by the glx-alternative-{mesa,nvidia} packages.
- As the implementations are split into several packages and optional
packages may be installed/removed later on, triggers are being used to
automatically update the alternatives whenever files of that vendor
implementation are added or removed.
-To switch between the GLX implementation from MESA, NVIDIA and AMD(fglrx),
+To switch between the GLX implementation from MESA and NVIDIA,
use the command
update-glx --config glx
diff --git a/debian/glx-diversions.lintian-overrides
b/debian/glx-diversions.lintian-overrides
index fa20a9f..7b56142 100644
--- a/debian/glx-diversions.lintian-overrides
+++ b/debian/glx-diversions.lintian-overrides
@@ -1,3 +1,5 @@
+# The magic is in the maintainer scripts.
+empty-binary-package
# We don't ship libraries, but we divert them.
maintscript-calls-ldconfig postinst
# The diversions are placed here.
diff --git a/debian/glx-diversions.postinst b/debian/glx-diversions.postinst
index 1d9ee9c..fb7011c 100644
--- a/debian/glx-diversions.postinst
+++ b/debian/glx-diversions.postinst
@@ -26,17 +26,22 @@ then
# make new diversions
add_multiarch_diversion libGL.so /usr/lib /usr/lib/mesa-diverted
add_multiarch_diversion libGL.so.1 /usr/lib /usr/lib/mesa-diverted
+ add_multiarch_diversion libGL.so.1.0.0 /usr/lib /usr/lib/mesa-diverted
add_multiarch_diversion libGL.so.1.2 /usr/lib /usr/lib/mesa-diverted
add_multiarch_diversion libGL.so.1.2.0 /usr/lib /usr/lib/mesa-diverted
+ add_multiarch_diversion libGL.so.1.7.0 /usr/lib /usr/lib/mesa-diverted
add_multiarch_diversion libEGL.so /usr/lib /usr/lib/mesa-diverted
add_multiarch_diversion libEGL.so.1 /usr/lib /usr/lib/mesa-diverted
add_multiarch_diversion libEGL.so.1.0.0 /usr/lib /usr/lib/mesa-diverted
+ add_multiarch_diversion libEGL.so.1.1.0 /usr/lib /usr/lib/mesa-diverted
add_multiarch_diversion libGLESv1_CM.so /usr/lib /usr/lib/mesa-diverted
add_multiarch_diversion libGLESv1_CM.so.1 /usr/lib
/usr/lib/mesa-diverted
add_multiarch_diversion libGLESv1_CM.so.1.1.0 /usr/lib
/usr/lib/mesa-diverted
+ add_multiarch_diversion libGLESv1_CM.so.1.2.0 /usr/lib
/usr/lib/mesa-diverted
add_multiarch_diversion libGLESv2.so /usr/lib /usr/lib/mesa-diverted
add_multiarch_diversion libGLESv2.so.2 /usr/lib /usr/lib/mesa-diverted
add_multiarch_diversion libGLESv2.so.2.0.0 /usr/lib
/usr/lib/mesa-diverted
+ add_multiarch_diversion libGLESv2.so.2.1.0 /usr/lib
/usr/lib/mesa-diverted
fi
@@ -80,8 +85,13 @@ if [ "$1" = "configure" ]; then
# do some validation of the diverted libGL.so and libGL.so.1
for triplet in $TRIPLETS ; do
- validate_diverted_symlink /usr/lib${triplet}libGL.so
/usr/lib/mesa-diverted${triplet}libGL.so mesa/libGL.so libGL.so.1
- validate_diverted_symlink /usr/lib${triplet}libGL.so.1
/usr/lib/mesa-diverted${triplet}libGL.so.1 mesa/libGL.so.1 libGL.so.1.2
libGL.so.1.2.0
+ validate_diverted_symlink /usr/lib${triplet}libGL.so
/usr/lib/mesa-diverted${triplet}libGL.so libGL.so.1
+ # the symlink should point to the newest (libglvnd > mesa >
ancient whatever) file that we have diverted
+ for target in libGL.so.1.7.0 libGL.so.1.0.0 libGL.so.1.2.0
libGL.so.1.2 NONE
+ do
+ test ! -f /usr/lib/mesa-diverted${triplet}${target} ||
break
+ done
+ validate_diverted_symlink /usr/lib${triplet}libGL.so.1
/usr/lib/mesa-diverted${triplet}libGL.so.1 ${target}
done
fi
diff --git a/debian/glx-diversions.postrm b/debian/glx-diversions.postrm
index 0c4e072..fb4015d 100644
--- a/debian/glx-diversions.postrm
+++ b/debian/glx-diversions.postrm
@@ -36,16 +36,21 @@ remove_multiarch_diversion()
if [ "$1" = "remove" ]; then
# restore libGL.so* from libgl1-mesa-{glx,dev}, diverted to
/usr/lib/mesa-diverted
+ remove_multiarch_diversion libGL.so.1.7.0 /usr/lib
/usr/lib/mesa-diverted
remove_multiarch_diversion libGL.so.1.2.0 /usr/lib
/usr/lib/mesa-diverted
remove_multiarch_diversion libGL.so.1.2 /usr/lib /usr/lib/mesa-diverted
+ remove_multiarch_diversion libGL.so.1.0.0 /usr/lib
/usr/lib/mesa-diverted
remove_multiarch_diversion libGL.so.1 /usr/lib /usr/lib/mesa-diverted
remove_multiarch_diversion libGL.so /usr/lib /usr/lib/mesa-diverted
+ remove_multiarch_diversion libEGL.so.1.1.0 /usr/lib
/usr/lib/mesa-diverted
remove_multiarch_diversion libEGL.so.1.0.0 /usr/lib
/usr/lib/mesa-diverted
remove_multiarch_diversion libEGL.so.1 /usr/lib /usr/lib/mesa-diverted
remove_multiarch_diversion libEGL.so /usr/lib /usr/lib/mesa-diverted
+ remove_multiarch_diversion libGLESv1_CM.so.1.2.0 /usr/lib
/usr/lib/mesa-diverted
remove_multiarch_diversion libGLESv1_CM.so.1.1.0 /usr/lib
/usr/lib/mesa-diverted
remove_multiarch_diversion libGLESv1_CM.so.1 /usr/lib
/usr/lib/mesa-diverted
remove_multiarch_diversion libGLESv1_CM.so /usr/lib
/usr/lib/mesa-diverted
+ remove_multiarch_diversion libGLESv2.so.2.1.0 /usr/lib
/usr/lib/mesa-diverted
remove_multiarch_diversion libGLESv2.so.2.0.0 /usr/lib
/usr/lib/mesa-diverted
remove_multiarch_diversion libGLESv2.so.2 /usr/lib
/usr/lib/mesa-diverted
remove_multiarch_diversion libGLESv2.so /usr/lib /usr/lib/mesa-diverted
diff --git a/debian/update-glx.manpages b/debian/update-glx.manpages
new file mode 100644
index 0000000..c83c207
--- /dev/null
+++ b/debian/update-glx.manpages
@@ -0,0 +1 @@
+update-glx.1
diff --git a/debian/update-glx.triggers b/debian/update-glx.triggers
index 2c005bb..879adb0 100644
--- a/debian/update-glx.triggers
+++ b/debian/update-glx.triggers
@@ -1 +1 @@
-interest register-glx-alternative-nvidia--ping
+interest-await register-glx-alternative-nvidia--ping
diff --git a/fglrx-blacklists-radeon.conf b/fglrx-blacklists-radeon.conf
deleted file mode 100644
index e87c414..0000000
diff --git a/update-glx b/update-glx
index 80d636a..3eb0789 100755
--- a/update-glx
+++ b/update-glx
@@ -11,6 +11,12 @@ of the 'glx' and 'nvidia' alternatives. After updating the
alternatives, it
takes care to trigger any follow-up actions that may be required to complete
the switch.
+It can be used to switch between the main NVIDIA driver version and the legacy
+drivers (eg: the 304 series, the 340 series, etc).
+
+For users with Optimus-type laptops it can be used to enable running the
discrete
+GPU via bumblebee.
+
Usage: $myname <command>
Commands:
diff --git a/update-glx.1 b/update-glx.1
new file mode 100644
index 0000000..dd42c2a
--- /dev/null
+++ b/update-glx.1
@@ -0,0 +1,60 @@
+.TH UPDATE-GLX: "1" "August 2017" "update-glx" "User Commands"
+.SH NAME
+update-glx \- select system GLX and NVIDIA providers
+.SH SYNOPSIS
+.B update\-glx\fR \-\-auto <name>
+.br
+.B update\-glx\fR \-\-display <name>
+.br
+.B update\-glx\fR \-\-query <name>
+.br
+.B update\-glx\fR \-\-list <name>
+.br
+.B update\-glx\fR \-\-config <name>
+.br
+.B update\-glx\fR \-\-set <name>
+.br
+.SH DESCRIPTION
+update\-glx is a wrapper around update\-alternatives supporting only
configuration
+of the 'glx' and 'nvidia' alternatives. After updating the alternatives, it
+takes care to trigger any follow\-up actions that may be required to complete
+the switch.
+
+It can be used to switch between the main NVIDIA driver version and the legacy
+drivers (eg: the 304 series, the 340 series, etc).
+
+For users with Optimus-type laptops it can be used to enable running the
discrete
+GPU via bumblebee.
+.SH OPTIONS
+.TP
+\fB\-\-auto\fR <name>
+switch the master link <name> to automatic mode.
+.TP
+\fB\-\-display\fR <name>
+display information about the <name> group.
+.TP
+\fB\-\-query\fR <name>
+machine parseable version of \fB\-\-display\fR <name>.
+.TP
+\fB\-\-list\fR <name>
+display all targets of the <name> group.
+.TP
+\fB\-\-config\fR <name>
+show alternatives for the <name> group and ask the
+user to select which one to use.
+.TP
+\fB\-\-set\fR <name> <path>
+set <path> as alternative for <name>.
+.PP
+<name> is the master name for this link group.
+.IP
+Only 'nvidia' and 'glx' are supported.
+.PP
+<path> is the location of one of the alternative target files.
+.IP
+(e.g. \fI\,/usr/lib/nvidia\/\fP)
+.PP
+Use 'update\-glx \fB\-\-help\fR' for program usage information.
+.SH AUTHOR
+.PP
+This manual page was written by Luca Boccassi <luca.bocca...@gmail.com> for
the Debian project.
diff --git a/zz_fglrx-blacklists-radeon b/zz_fglrx-blacklists-radeon
deleted file mode 100755
index 13a86a0..0000000
