[Python-modules-commits] r15149 - in packages/pyglet/trunk/debian (3 files)

[yoh at users.alioth.debian.org]

    Date: Sunday, December 26, 2010 @ 23:32:53
  Author: yoh
Revision: 15149

up_no_standard_config_available: use find_library first -- workaround the issue for NVidia GLX libraries (Closes: #584548)

Added:
  packages/pyglet/trunk/debian/patches/up_no_standard_config_available
Modified:
  packages/pyglet/trunk/debian/changelog
  packages/pyglet/trunk/debian/patches/series

Modified: packages/pyglet/trunk/debian/changelog
===================================================================
--- packages/pyglet/trunk/debian/changelog	2010-12-26 23:32:45 UTC (rev 15148)
+++ packages/pyglet/trunk/debian/changelog	2010-12-26 23:32:53 UTC (rev 15149)
@@ -20,6 +20,8 @@
       for the context to replace deprecated in 2.6 string exceptions
       (Closes: #585316)
     - up_typo_have_getprocaddress: minor typo
+    - up_no_standard_config_available: use find_library first -- workaround
+      the issue for NVidia GLX libraries (Closes: #584548)
 
  -- Yaroslav Halchenko <debian at onerussian.com>  Sat, 25 Dec 2010 22:25:44 -0500
 

Modified: packages/pyglet/trunk/debian/patches/series
===================================================================
--- packages/pyglet/trunk/debian/patches/series	2010-12-26 23:32:45 UTC (rev 15148)
+++ packages/pyglet/trunk/debian/patches/series	2010-12-26 23:32:53 UTC (rev 15149)
@@ -1,2 +1,3 @@
 up_no_string_exceptions
 up_typo_have_getprocaddress
+up_no_standard_config_available

Added: packages/pyglet/trunk/debian/patches/up_no_standard_config_available
===================================================================
--- packages/pyglet/trunk/debian/patches/up_no_standard_config_available	                        (rev 0)
+++ packages/pyglet/trunk/debian/patches/up_no_standard_config_available	2010-12-26 23:32:53 UTC (rev 15149)
@@ -0,0 +1,35 @@
+Author: neusepoff
+Origin: http://code.google.com/p/pyglet/issues/detail?id=456#c8
+Bug: http://code.google.com/p/pyglet/issues/detail?id=456
+Bug-Debian: http://bugs.debian.org/584548
+Subject: use find_library first prior adding libraries by a pattern of the name
+
+From original patch comments:
+
+okay, this has to do with the nvidia package of debian providing the
+wrong link for the libGL.so alternative (linking to the diversion
+instead of the right file), see:
+
+http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=597452
+
+it doesn't harm most software as these are linked agains libGL.so.1
+anyway.  but pyglet is trying to load libGL.so first and then falling
+back to find_library().
+
+I've attached a patch witch solves this by trying to load the library
+using find_library() first and then falling back to the hardcoded
+name.
+
+--- a/pyglet/lib.py
++++ b/pyglet/lib.py
+@@ -96,7 +96,9 @@ class LibraryLoader(object):
+             platform_names = list(platform_names)
+ 
+         if self.platform == 'linux2':
+-            platform_names.extend(['lib%s.so' % n for n in names])
++            for name in names:
++                libname = ctypes.util.find_library(name)
++                platform_names.append(libname or 'lib%s.so' % name)
+ 
+         platform_names.extend(names)
+         for name in platform_names: