diff -Nru debtags-1.9+git20120312/debian/changelog debtags-1.9+git20120320/debian/changelog --- debtags-1.9+git20120312/debian/changelog 2012-03-12 10:09:41.000000000 +0000 +++ debtags-1.9+git20120320/debian/changelog 2012-03-20 07:53:34.000000000 +0000 @@ -1,3 +1,12 @@ +debtags (1.9+git20120320) precise; urgency=low + + * New git snapshot: + - use explit libGL.so.1 and libX11.so.6 to ensure that + cdll.LoadLibrary() finds them + - if the opengl backend returns "None" return HardwareSupported.UNKNOWN + + -- Michael Vogt Tue, 20 Mar 2012 08:52:33 +0100 + debtags (1.9+git20120312) precise; urgency=low * New git snapshot: diff -Nru debtags-1.9+git20120312/debtagshw/detectors.py debtags-1.9+git20120320/debtagshw/detectors.py --- debtags-1.9+git20120312/debtagshw/detectors.py 2012-03-12 09:27:05.000000000 +0000 +++ debtags-1.9+git20120320/debtagshw/detectors.py 2012-03-20 07:52:14.000000000 +0000 @@ -207,9 +207,9 @@ if tag in self.TAG_TO_FUNC: func = self.TAG_TO_FUNC[tag] res = func() - if res: + if res is True: return HardwareSupported.YES - else: + elif res is False: return HardwareSupported.NO return HardwareSupported.UNKNOWN diff -Nru debtags-1.9+git20120312/debtagshw/opengl.py debtags-1.9+git20120320/debtagshw/opengl.py --- debtags-1.9+git20120312/debtagshw/opengl.py 2012-03-12 10:09:46.000000000 +0000 +++ debtags-1.9+git20120320/debtagshw/opengl.py 2012-03-20 07:52:14.000000000 +0000 @@ -32,7 +32,7 @@ # 3d driver detection data, map render/vendor string to driver RENDERER_TO_DRIVER = [ - # from unity_support_test.c + # from tools/unity_support_test.c in the nux-tools pkg ("Software Rasterizer", "sw"), ("Mesa X11", "sw"), ("on softpipe", "sw"), @@ -78,15 +78,15 @@ # tricks with /etc/ld.so.conf.d/x86_64-linux-gnu_GL.conf to # make it the default libGL.so but apparently the cdll.LoadLibrary # does not support the ld.so.conf.d directory (yet?) - if os.path.exists("/usr/lib/fglrx/libGL.so"): - return "/usr/lib/fglrx/libGL.so" - return "libGL.so" + if os.path.exists("/usr/lib/fglrx/libGL.so.1"): + return "/usr/lib/fglrx/libGL.so.1" + return "libGL.so.1" def _get_opengl_vendor_renderer_version_tuple(self): """ returns a vendor, renderer, version tuple """ from ctypes import cdll, c_char, c_char_p, c_int, byref # load stuff - x11 = cdll.LoadLibrary("libX11.so") + x11 = cdll.LoadLibrary("libX11.so.6") glx = cdll.LoadLibrary(self._find_opengl_lib_path()) # get display display = x11.XOpenDisplay("") Binary files /tmp/TYm2eIPO2l/debtags-1.9+git20120312/tags-current.gz and /tmp/jKrcWfVjMF/debtags-1.9+git20120320/tags-current.gz differ