mesa: Changes to 'ubuntu'
debian/rules | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit a472c147cff197094151972508829dcc13d11365
Author: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
Date: Thu Jul 7 14:41:12 2011 +1000
Fix r300g even harder.
Manually install it after the generic dh_install call so that it overwrites
the r300c that gets picked up from libgl1-mesa-dri.install.linux.in.
Otherwise r300_dri in libgl1-mesa-dri is always the classic driver.
diff --git a/debian/rules b/debian/rules
index 2edf257..e8a71c3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -315,10 +315,10 @@ binary-arch: install
# No need for this .so, libglapi is just a convenience library:
rm debian/tmp/dri/usr/lib/${DEB_HOST_MULTIARCH}/libglapi.so
+ dh_install -s --fail-missing
ifneq (,$(filter r300,$(GALLIUM_DRIVERS)))
dh_install -plibgl1-mesa-dri build/dri/$(DEB_HOST_MULTIARCH)/gallium/r300_dri.so usr/lib/${DEB_HOST_MULTIARCH}/dri
endif
- dh_install -s --fail-missing
# Create an ld.so.conf which says where to find libGL from Mesa
echo "/usr/lib/$(DEB_HOST_MULTIARCH)/mesa" \
commit 326089703a764dcc3431f4b890c1f476f71f4c85
Author: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
Date: Thu Jul 7 14:37:37 2011 +1000
Fix r300g handling more.
The package is libgl1-mesa-dri, not libgl1-mesa-dri.install!
(cherry picked from commit 879b23a5e7450b1200e72110a8ac0858a9de3a16)
diff --git a/debian/rules b/debian/rules
index 558489f..2edf257 100755
--- a/debian/rules
+++ b/debian/rules
@@ -316,7 +316,7 @@ binary-arch: install
rm debian/tmp/dri/usr/lib/${DEB_HOST_MULTIARCH}/libglapi.so
ifneq (,$(filter r300,$(GALLIUM_DRIVERS)))
- dh_install -plibgl1-mesa-dri.install build/dri/$(DEB_HOST_MULTIARCH)/gallium/r300_dri.so usr/lib/${DEB_HOST_MULTIARCH}/dri
+ dh_install -plibgl1-mesa-dri build/dri/$(DEB_HOST_MULTIARCH)/gallium/r300_dri.so usr/lib/${DEB_HOST_MULTIARCH}/dri
endif
dh_install -s --fail-missing
commit 0e7db5512644678eb03b052a04370327377239d1
Author: Cyril Brulebois <kibi@debian.org>
Date: Sun Jul 3 12:56:59 2011 +0200
Fix r300g handling.
Install into the right package, and in the proper directory.
(cherry picked from commit 5a8cb46ad7e9c2857a23d9c78975e1cce6c8f8c7)
diff --git a/debian/rules b/debian/rules
index f1b0481..558489f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -316,7 +316,7 @@ binary-arch: install
rm debian/tmp/dri/usr/lib/${DEB_HOST_MULTIARCH}/libglapi.so
ifneq (,$(filter r300,$(GALLIUM_DRIVERS)))
- dh_install build/dri/$(DEB_HOST_MULTIARCH)/gallium/r300_dri.so
+ dh_install -plibgl1-mesa-dri.install build/dri/$(DEB_HOST_MULTIARCH)/gallium/r300_dri.so usr/lib/${DEB_HOST_MULTIARCH}/dri
endif
dh_install -s --fail-missing
Reply to: