debian/changelog | 7 +++++++ debian/control | 2 +- debian/rules | 5 ++--- 3 files changed, 10 insertions(+), 4 deletions(-)
New commits: commit 6987f4443c1a295dee829842205ae1e992b89222 Author: Julien Cristau <[email protected]> Date: Fri Aug 26 11:04:52 2011 +0200 Upload to unstable diff --git a/debian/changelog b/debian/changelog index b276aab..be522ab 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -mesa (7.11-3) UNRELEASED; urgency=low +mesa (7.11-3) unstable; urgency=low * Don't build libgbm on kfreebsd, it needs KMS/udev. * Build/ship r300g on all Linux architectures, not just x86. - -- Julien Cristau <[email protected]> Fri, 26 Aug 2011 10:58:06 +0200 + -- Julien Cristau <[email protected]> Fri, 26 Aug 2011 11:04:45 +0200 mesa (7.11-2) unstable; urgency=low commit 7736e984144d1c76df3ccde85403f70518b819b6 Author: Julien Cristau <[email protected]> Date: Fri Aug 26 11:04:02 2011 +0200 Build/ship r300g on all Linux architectures, not just x86. diff --git a/debian/changelog b/debian/changelog index 346fa52..b276aab 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ mesa (7.11-3) UNRELEASED; urgency=low * Don't build libgbm on kfreebsd, it needs KMS/udev. + * Build/ship r300g on all Linux architectures, not just x86. -- Julien Cristau <[email protected]> Fri, 26 Aug 2011 10:58:06 +0200 diff --git a/debian/rules b/debian/rules index 87d448f..5c54dd6 100755 --- a/debian/rules +++ b/debian/rules @@ -77,7 +77,7 @@ else ifeq ($(DEB_HOST_ARCH_OS), linux) # Gallium drivers require libdrm-{nouveau,radeon}, only available on Linux - GALLIUM_DRIVERS += nouveau r600 + GALLIUM_DRIVERS += nouveau r600 r300 # Although the KMS egl drivers will probably build on kfreebsd & hurd # only linux actually has KMS drivers implemented at this point. EGL_DISPLAYS += drm @@ -94,9 +94,8 @@ else DRI_DRIVERS += i915 i965 sis unichrome endif - # LLVM is required for r300g, and x86-ish: + # LLVM is required for r300g on x86: ifneq (,$(filter $(DEB_HOST_ARCH),amd64 i386)) - GALLIUM_DRIVERS += r300 confflags_GALLIUM += --enable-gallium-llvm endif commit 356fb969cf091719a4087b1def42193e9ec8e6ec Author: Julien Cristau <[email protected]> Date: Fri Aug 26 10:58:42 2011 +0200 Don't build libgbm on kfreebsd, it needs KMS/udev. diff --git a/debian/changelog b/debian/changelog index b380faa..346fa52 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +mesa (7.11-3) UNRELEASED; urgency=low + + * Don't build libgbm on kfreebsd, it needs KMS/udev. + + -- Julien Cristau <[email protected]> Fri, 26 Aug 2011 10:58:06 +0200 + mesa (7.11-2) unstable; urgency=low * Work around the lack of O_CLOEXEC on kfreebsd, fix FTBFS. diff --git a/debian/control b/debian/control index 39aed0d..4d9c757 100644 --- a/debian/control +++ b/debian/control @@ -144,7 +144,7 @@ Description: free implementation of the OpenGL API -- development files Package: libgbm1 Section: libs -Architecture: linux-any kfreebsd-any +Architecture: linux-any Depends: ${shlibs:Depends}, ${misc:Depends}, -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/[email protected]
