[pkg-nvidia-devel] r1432 - in /packages/nvidia-graphics-drivers/trunk/debian: README.alternatives changelog libgl1-nvidia-glx-ia32.docs libgl1-nvidia-glx.docs nvidia-glx.docs

anbe-guest at users.alioth.debian.org anbe-guest at users.alioth.debian.org
Thu Aug 26 09:34:37 UTC 2010


Author: anbe-guest
Date: Thu Aug 26 09:34:37 2010
New Revision: 1432

URL: http://svn.debian.org/wsvn/pkg-nvidia/?sc=1&rev=1432
Log:
document alternatives

Added:
    packages/nvidia-graphics-drivers/trunk/debian/README.alternatives
    packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-glx-ia32.docs
Modified:
    packages/nvidia-graphics-drivers/trunk/debian/changelog
    packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-glx.docs
    packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.docs

Added: packages/nvidia-graphics-drivers/trunk/debian/README.alternatives
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/README.alternatives?rev=1432&op=file
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/README.alternatives (added)
+++ packages/nvidia-graphics-drivers/trunk/debian/README.alternatives Thu Aug 26 09:34:37 2010
@@ -1,0 +1,49 @@
+The following alternatives are available and may be customized locally to
+disable/enable the libraries from NVIDIA:
+
+
+libglx.so
+=========
+
+NVIDIA provides its own libglx.so module for X.org which is shipped in the
+nvidia-glx (or a corresponding nvidia-glx-legacy*) package.
+The original module from X.org is diverted away (still available as an
+alternative with low priority) and replaced by a configurable alternative
+using the non-free module with higher priority so it is enabled by default.
+
+Manual disabling (and later reenabling) can be done with the command
+
+    update-alternatives --config libglx.so
+
+
+libgGL.so.1
+===========
+
+NVIDIA provides accelerated OpenGL libraries libGL.so* which are shipped 
+in the libgl1-nvidia-glx (or a corresponding libgl1-nvidia-legacy*-glx)
+package.
+The free MESA libGL.so.1 is available as an alternative with low priority
+(if libgl1-mesa-glx is installed) while the non-free accelerated NVIDIA
+libGL.so.1 is installed as a reconfigurable alternative with higher priority
+so it is enabled by default.
+
+Manual disabling (and later reenabling) can be done with the command
+
+    update-alternatives --config libGL.so.1
+
+The same setup is used for libgl1-nvidia-glx-ia32.  The reconfigurable
+alternative is called ia32-libGL.so.1
+
+
+libGL.so
+========
+
+No alternative for libGL.so is set up by the libgl1-nvidia-dev (or a
+corresponding libgl1-nvidia-legacy*-dev) package.
+It is generally preferred to link with the MESA libraries during compilation,
+so one does not accidently pick up private symbols from NVIDIA.  Anyway,
+building OpenGL applications should be done with libgl1-mesa-dev installed.
+
+
+ -- Andreas Beckmann <debian at abeckmann.de>  Thu, 26 Aug 2010 11:21:31 +0200
+

Modified: packages/nvidia-graphics-drivers/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/changelog?rev=1432&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/changelog (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/changelog Thu Aug 26 09:34:37 2010
@@ -4,9 +4,11 @@
   * Remove workaround for dpkg-divert bug #581544, fixed in dpkg 1.15.8.
   * Change handling of Xorg module libglx.so to use alternatives, too.  Move
     the diversion of libglx.so to new package libglx-nvidia-alternatives and
-    use a trigger there to create the alternatives.
+    use a trigger there to create the alternatives.  (Closes: #594299)
   * Divert the debug symbols of libglx.so from Xorg, too.
   * All diversions are now configurable via alternatives.  (Closes: #401582)
+  * README.alternatives: document the diversions and alternatives.
+    (Closes: #594297)
   * Update main and module source packages to debhelper 8.
     - dh_makeshlibs automatically picks up libraries in /usr/lib/nvidia etc.
   * nvidia-kernel-{dkms,source}: add Conflicts: with badly sorting obsolete

Added: packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-glx-ia32.docs
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-glx-ia32.docs?rev=1432&op=file
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-glx-ia32.docs (added)
+++ packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-glx-ia32.docs Thu Aug 26 09:34:37 2010
@@ -1,0 +1,1 @@
+debian/README.alternatives

Modified: packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-glx.docs
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-glx.docs?rev=1432&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-glx.docs (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-glx.docs Thu Aug 26 09:34:37 2010
@@ -1,1 +1,2 @@
+debian/README.alternatives
 debian/tmp/usr/share/doc/README.txt

Modified: packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.docs
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.docs?rev=1432&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.docs (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.docs Thu Aug 26 09:34:37 2010
@@ -1,2 +1,3 @@
+debian/README.alternatives
 debian/tmp/usr/share/doc/README.txt
 debian/tmp/usr/share/doc/html/




More information about the Pkg-nvidia-devel mailing list