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
1=== modified file 'debian/changelog'
2--- debian/changelog 2011-02-20 13:51:31 +0000
3+++ debian/changelog 2011-02-23 20:41:20 +0000
4@@ -1,8 +1,13 @@
5 libavg (1.5.3-0ubuntu2) UNRELEASED; urgency=low
6
7+ [ OXullo Intersecans ]
8 * New package descriptions
9
10- -- OXullo Intersecans <x@brainrapers.org> Sun, 20 Feb 2011 14:51:04 +0100
11+ [ Chase Douglas ]
12+ * Fix segfault on start up in Ubuntu due to Mesa glx tls issue
13+ - Added 0002-load-libstdc++-first.patch
14+
15+ -- Chase Douglas <chase.douglas@ubuntu.com> Wed, 23 Feb 2011 15:04:56 -0500
16
17 libavg (1.5.3-0ubuntu1) UNRELEASED; urgency=low
18
19
20=== added file 'debian/patches/0002-load-libstdc++-first.patch'
21--- debian/patches/0002-load-libstdc++-first.patch 1970-01-01 00:00:00 +0000
22+++ debian/patches/0002-load-libstdc++-first.patch 2011-02-23 20:41:20 +0000
23@@ -0,0 +1,11 @@
24+--- a/src/wrapper/__init__.py 2011-02-23 15:01:42.727682980 -0500
25++++ b/src/wrapper/__init__.py 2011-02-23 15:02:30.837682985 -0500
26+@@ -1,3 +1,8 @@
27++# Work around libstdc++ Mesa bug
28++# (https://bugs.launchpad.net/ubuntu/+source/mesa/+bug/259219)
29++from ctypes import cdll
30++cdll.LoadLibrary("libstdc++.so.6")
31++
32+ from avg import *
33+ import anim
34+ import draggable
35
36=== modified file 'debian/patches/series'
37--- debian/patches/series 2011-02-05 01:12:26 +0000
38+++ debian/patches/series 2011-02-23 20:41:20 +0000
39@@ -1,1 +1,2 @@
40 0001-do-not-build-tests-by-default.patch
41+0002-load-libstdc++-first.patch

Subscribers

People subscribed via source and target branches