diff options
| author | Christopher James Halse Rogers <christopher.halse.rogers@canonical.com> | 2010-06-01 19:01:03 +1000 |
|---|---|---|
| committer | Christopher James Halse Rogers <christopher.halse.rogers@canonical.com> | 2010-06-01 19:01:03 +1000 |
| commit | f1cf090f714620bf658c10c6588b1ca68732edd5 (patch) | |
| tree | 23dd167ab6895a1b3b9ad9997649d5460ce6deae /debian | |
| parent | 78e28df182379e7326ca71e8c3bfb74a00c85ad8 (diff) | |
Drop searchpath-based gallium coexistance.
Although libgl is quite happy to load the gallium drivers from /usr/lib/dri-gallium,
X itself doesn't respect --dri-drivers-path, so AIGLX reverts to swrast.
Where there's both a classic and a gallium driver, development is likely to move entirely
to the gallium driver in the relatively near future, so having classic & gallium drivers
co-existing will be a short-term problem only.
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/libgl1-mesa-dri-gallium.install | 2 | ||||
| -rwxr-xr-x | debian/rules | 5 |
2 files changed, 1 insertions, 6 deletions
diff --git a/debian/libgl1-mesa-dri-gallium.install b/debian/libgl1-mesa-dri-gallium.install index 07937bbf9ff..e801791b5ef 100644 --- a/debian/libgl1-mesa-dri-gallium.install +++ b/debian/libgl1-mesa-dri-gallium.install @@ -1 +1 @@ -build/dri/glx/gallium/*.so usr/lib/dri-gallium/ +build/dri/glx/gallium/*.so usr/lib/dri diff --git a/debian/rules b/debian/rules index e658e77ef4b..aa5add05285 100755 --- a/debian/rules +++ b/debian/rules @@ -192,11 +192,6 @@ confflags-swx11+glu-i386-i686 = \ --libdir=/usr/lib/i686/cmov \ CFLAGS="$(CFLAGS) -march=i686" -# Add /usr/lib/dri-gallium to the front of the search paths so that users can -# opt-in to installing gallium drivers there and have them override the classic -# drivers. -confflags-dri += --with-dri-searchpath=/usr/lib/dri-gallium:/usr/lib/dri - configure: $(QUILT_STAMPFN) configure.ac autoreconf -vfi |