Created by Peter Pearse on 2011-05-11 and last modified on 2011-05-11
Get this branch:
bzr branch lp:~peter-pearse/ubuntu/oneiric/mesa/prop001
Only Peter Pearse can upload to this branch. If you are Peter Pearse please log in for upload directions.

Branch merges

Related bugs

Related blueprints

Branch information

Peter Pearse

Recent revisions

141. By Peter Pearse on 2011-05-11

Patch mklib for linux cross builds.

140. By Timo Aaltonen on 2011-04-19

[ Felix Geyer ]
Add 114_intel_dri_renderer_string.diff: Re-add "GEM" to the dri renderer
string of the intel driver. Removing it breaks KDE's detection for the blur
effect. (LP: #753370)

139. By Chris Halse Rogers on 2011-04-11

[ Steve Langasek ]
* Fix alternatives removal on removal of libgl1-mesa-{swx11,glx}: the
  files are in /usr/lib/mesa, not /usr/lib/GL.
* The architecture we're building for is DEB_HOST_ARCH, not

[ Christopher James Halse Rogers ]
* New upstream bugfix release.
  - Contains fix for KWin crash when enabling effects on r600 (LP: #738687)
* debian/patches/105_use_shared_libdricore.patch: Fix rpath for i386
  libraries installed on amd64 via ia32-libs. (LP: #755720)

138. By Chris Halse Rogers on 2011-03-17

* debian/patches/113_partially_fix_tls.diff:
  - Also fix the IA32 dispatch code, rename to 113_fix_tls.diff.
* debian/rules:
  - Re-enable assembler on i386, now that the dispatch code has been fixed.
    (LP: #735188)

137. By Chris Halse Rogers on 2011-03-15

* The “stop SIGSEGVing unrelated code” upload.
* debian/patches/113_partially_fix_tls.diff:
  - Fix TLS usage: initial-exec is not appropriate for a library that
    can be dynamically loaded with dlopen. (LP: #259219)
  - Partial patch: missing IA32 assembler dispatch code.
* debian/rules:
  - Build without optimised assembler on i386, as we haven't fixed that
    yet. Opens LP #735188.

136. By Chris Halse Rogers on 2011-03-08

* New upstream bugfix release.
  - Drop cherry-picks now upstream:
    + 110_nv50_fix_tgsi_sign_mode.diff
    + 109_fix_length_of_glxgetfbconfigssgix.patch
* 112_fix_segfault_on_nvAF.diff:
  - Fix from nouveau ML for segfault on X startup with nvAF cards.
    Fixed differently in upstream/master, so drop after 7.10
    (LP: #723012)

135. By Chris Halse Rogers on 2011-02-18

* debian/rules:
* debian/libgl1-mesa-dri.install.linux:
  - Add /usr/lib/dri-alternates to the driver search path, and install the
    classic r300 and r600 drivers there so mesa will fallback when the
    gallium drivers are unavailable (such as when using UMS).
* debian/patches/111_export_searchdirs_in_dripc.diff:
  - Add drisearchdirs variable to dri.pc so the Xserver can pick up the
    alternate DRI driver dirs.

134. By Chris Halse Rogers on 2011-02-16

* Merge from Debian. Remaining Ubuntu changes:
 - debian/control
    + Drop lesstif-dev from Build-Depends; it's in Universe.
    + Comment out GLw libs since it depends on lesstif-dev.
    + Drop i686 swx11 libgl package.
    + Add libdrm-dev to mesa-common-dev Depends.
    + Drop [linux-any] qualifier from libudev-dev to fix pbuilder FTBFS
      (see deb bug 600823)
  - debian/rules
    + Use --disable-glw for swx11 targets too.
    + Don't enable motif for swx11 targets.
    + Use lzma compression for binary debs to save CD space.
    + Drop unloved mach64 driver.
    + Install both r300/r300g and r600/r600g
  - debian/patches
    + 100_no_abi_tag.patch
    + 101_ubuntu_hidden_glname.patch
    + 103_savage-expose_fbmodes_with_nonzero_alpha.patch
  - rules, libgl1-mesa-{glx,dev,swx11,swx11-dev}.install,
    libgl1-mesa-{glx,swx11}.{postinst,prerm}, libgl1-mesa-dev.links:
    Install libGL.so* in /usr/lib/mesa to allow things to work with
  - debian/gbp.conf
    + Point at Ubuntu branch to make git-buildpackage less narky.
  - debian/patches/105_use_shared_libdricore.patch, debian/rules:
    + Link DRI drivers against shared dricore routines to save CD space.
  - debian/patches/109_fix_length_of_glxgetfbconfigssgix.patch:
    Fix "BadLength (poly request too large or internal Xlib length"
    when using non-C, non-en locales. (LP 714280)
  - debian/patches/108_fix_leaks_dri2_screen_creation.patch: Cherrypick
    to fix some leaks in DRI2 screen creation failure paths.
* New upstream snapshot from 7.10 release branch.
* debian/patches/10_fix_talloc_linking.diff:
  - Drop. Upstream has replaced talloc with an in-tree replacement
* debian/patches/105_use_shared_libdricore.patch:
  - Refresh for talloc-dropping buildsystem changes.
* debian/patches/107_winsys_buffer_nullptr.patch:
  - Drop. Included upstream.
* debian/patches/110_nv50_fix_tgsi_sign_mode.diff:
  - Cherry-pick from master. Fixes assert hit by Unity on nv5x hardware
    (LP: #710588)
* debian/control:
  - Drop no-longer-used libtalloc-dev build-dependency.
* debian/not-installed:
  - Remove i686 files from not-installed list; we don't build the i686 swx11

133. By Bryce Harrington on 2011-02-15

Add 109_fix_length_of_glxgetfbconfigssgix.patch: Second try at fix for
"BadLength (poly request too large or internal Xlib length" when using
non-C, non-en locales. This time with the real fix.
(LP: #714280)

132. By Bryce Harrington on 2011-02-14

* Add 108_fix_leaks_dri2_screen_creation.patch: Cherrypick from upstream
  to fix leaks in DRI2 screen creation error paths, which causes Clutter
  applications to fail with error, "BadLength (poly request too large or
  internal Xlib length".
  (LP: #714280)
* Change dep on libudev-dev to not limit to linux-any (fixes FTBS when
  using pbuilder, see deb bug 600823)

Branch metadata

Branch format:
Branch format 7
Repository format:
Bazaar repository format 2a (needs bzr 1.16 or later)
Stacked on:
This branch contains Public information 
Everyone can see this information.