Merge lp:~chasedouglas/oif/libavg-packaging-load-libstdc++ into lp:~oxullo/oif/libavg-packaging

Proposed by Chase Douglas
Status: Merged
Merge reported by: OXullo Intersecans
Merged at revision: not available
Proposed branch: lp:~chasedouglas/oif/libavg-packaging-load-libstdc++
Merge into: lp:~oxullo/oif/libavg-packaging
Diff against target: 41 lines (+18/-1)
3 files modified
debian/changelog (+6/-1)
debian/patches/0002-load-libstdc++-first.patch (+11/-0)
debian/patches/series (+1/-0)
To merge this branch: bzr merge lp:~chasedouglas/oif/libavg-packaging-load-libstdc++
Reviewer Review Type Date Requested Status
OXullo Intersecans Pending
Review via email: mp+50995@code.launchpad.net

Description of the change

Load libstdc++ first when loading libavg. This works around the Mesa glx tls bug.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/changelog'
--- debian/changelog 2011-02-20 13:51:31 +0000
+++ debian/changelog 2011-02-23 20:41:20 +0000
@@ -1,8 +1,13 @@
1libavg (1.5.3-0ubuntu2) UNRELEASED; urgency=low1libavg (1.5.3-0ubuntu2) UNRELEASED; urgency=low
22
3 [ OXullo Intersecans ]
3 * New package descriptions 4 * New package descriptions
45
5 -- OXullo Intersecans <x@brainrapers.org> Sun, 20 Feb 2011 14:51:04 +01006 [ Chase Douglas ]
7 * Fix segfault on start up in Ubuntu due to Mesa glx tls issue
8 - Added 0002-load-libstdc++-first.patch
9
10 -- Chase Douglas <chase.douglas@ubuntu.com> Wed, 23 Feb 2011 15:04:56 -0500
611
7libavg (1.5.3-0ubuntu1) UNRELEASED; urgency=low12libavg (1.5.3-0ubuntu1) UNRELEASED; urgency=low
813
914
=== added file 'debian/patches/0002-load-libstdc++-first.patch'
--- debian/patches/0002-load-libstdc++-first.patch 1970-01-01 00:00:00 +0000
+++ debian/patches/0002-load-libstdc++-first.patch 2011-02-23 20:41:20 +0000
@@ -0,0 +1,11 @@
1--- a/src/wrapper/__init__.py 2011-02-23 15:01:42.727682980 -0500
2+++ b/src/wrapper/__init__.py 2011-02-23 15:02:30.837682985 -0500
3@@ -1,3 +1,8 @@
4+# Work around libstdc++ Mesa bug
5+# (https://bugs.launchpad.net/ubuntu/+source/mesa/+bug/259219)
6+from ctypes import cdll
7+cdll.LoadLibrary("libstdc++.so.6")
8+
9 from avg import *
10 import anim
11 import draggable
012
=== modified file 'debian/patches/series'
--- debian/patches/series 2011-02-05 01:12:26 +0000
+++ debian/patches/series 2011-02-23 20:41:20 +0000
@@ -1,1 +1,2 @@
10001-do-not-build-tests-by-default.patch10001-do-not-build-tests-by-default.patch
20002-load-libstdc++-first.patch

Subscribers

People subscribed via source and target branches