diff options
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | debian/control | 2 | ||||
| -rw-r--r-- | debian/libegl1-mesa-dev.install.in | 4 | ||||
| -rw-r--r-- | debian/libegl1-mesa-drivers.install.in | 5 | ||||
| -rw-r--r-- | debian/libegl1-mesa.symbols | 2 | ||||
| -rwxr-xr-x | debian/rules | 2 |
6 files changed, 13 insertions, 9 deletions
diff --git a/debian/changelog b/debian/changelog index 3f3620b81b..c13e5e615c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,16 @@ mesa (7.11~1-1) UNRELEASED; urgency=low + [ Cyril Brulebois ] * New upstream snapshot from the 7.11 branch (up to 1ad06c7a25): - Fix regression from 7.10, missing characters in text display with intel drivers (Closes: #631516). Thanks to Martin Steigerwald for the report and the tests. - -- Cyril Brulebois <kibi@debian.org> Tue, 28 Jun 2011 12:06:59 +0200 + [ Christopher James Halse Rogers ] + * Temporarily disable Wayland EGL backend as it requires a newer + libwayland-dev + + -- Christopher James Halse Rogers <raof@ubuntu.com> Tue, 28 Jun 2011 21:34:53 +0100 mesa (7.11~0-2) experimental; urgency=low diff --git a/debian/control b/debian/control index 30aab6115f..696cb3878d 100644 --- a/debian/control +++ b/debian/control @@ -31,7 +31,7 @@ Build-Depends: flex, bison, llvm-2.9-dev [amd64 i386], - libwayland-dev, +# libwayland-dev, Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/mesa Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/mesa.git Homepage: http://mesa3d.sourceforge.net/ diff --git a/debian/libegl1-mesa-dev.install.in b/debian/libegl1-mesa-dev.install.in index b6f8614815..3f3094f289 100644 --- a/debian/libegl1-mesa-dev.install.in +++ b/debian/libegl1-mesa-dev.install.in @@ -1,6 +1,6 @@ dri/usr/lib/${DEB_HOST_MULTIARCH}/libEGL.so usr/lib/${DEB_HOST_MULTIARCH} -dri/usr/lib/${DEB_HOST_MULTIARCH}/libwayland-egl.so usr/lib/${DEB_HOST_MULTIARCH} +#dri/usr/lib/${DEB_HOST_MULTIARCH}/libwayland-egl.so usr/lib/${DEB_HOST_MULTIARCH} dri/usr/include/EGL usr/include dri/usr/include/KHR usr/include dri/usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/egl.pc usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig -dri/usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/wayland-egl.pc usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig +#dri/usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/wayland-egl.pc usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig diff --git a/debian/libegl1-mesa-drivers.install.in b/debian/libegl1-mesa-drivers.install.in index f5914015d6..c226c5e818 100644 --- a/debian/libegl1-mesa-drivers.install.in +++ b/debian/libegl1-mesa-drivers.install.in @@ -1,4 +1,3 @@ dri/usr/lib/${DEB_HOST_MULTIARCH}/egl/egl_gallium.so usr/lib/${DEB_HOST_MULTIARCH}/egl -dri/usr/lib/${DEB_HOST_MULTIARCH}/egl/pipe_*.so usr/lib/${DEB_HOST_MULTIARCH}/egl -dri/usr/lib/${DEB_HOST_MULTIARCH}/libwayland-egl.so.1 usr/lib/${DEB_HOST_MULTIARCH} -dri/usr/lib/${DEB_HOST_MULTIARCH}/libwayland-egl.so.1.0 usr/lib/${DEB_HOST_MULTIARCH} +#dri/usr/lib/${DEB_HOST_MULTIARCH}/libwayland-egl.so.1 usr/lib/${DEB_HOST_MULTIARCH} +#dri/usr/lib/${DEB_HOST_MULTIARCH}/libwayland-egl.so.1.0 usr/lib/${DEB_HOST_MULTIARCH} diff --git a/debian/libegl1-mesa.symbols b/debian/libegl1-mesa.symbols index 6d56af4780..987e9a9d2f 100644 --- a/debian/libegl1-mesa.symbols +++ b/debian/libegl1-mesa.symbols @@ -62,4 +62,4 @@ libEGL.so.1 libegl1-mesa #MINVER# | libegl1-x11 eglWaitClient@Base 7.8.1 eglWaitGL@Base 7.8.1 eglWaitNative@Base 7.8.1 - wl_drm_interface@Base 7.11~0 +# wl_drm_interface@Base 7.11~0 diff --git a/debian/rules b/debian/rules index 3f6e704755..f4a0a70d3d 100755 --- a/debian/rules +++ b/debian/rules @@ -81,7 +81,7 @@ else GALLIUM_DRIVERS += nouveau r600 # Although the KMS egl drivers will probably build on kfreebsd & hurd # only linux actually has KMS drivers implemented at this point. - EGL_DISPLAYS += drm wayland + EGL_DISPLAYS += drm # Nouveau requires KMS, so even the classic DRI driver only works on linux DRI_DRIVERS += nouveau endif |