Re: mesa 8.0 in wheezy?
On 2012-03-30 20:54 +0200, Cyril Brulebois wrote:
> Andres Cimmarusti <acimmarusti@gmail.com> (30/03/2012):
>> I'm just wondering why is mesa 8.0 being held in experimental and it's
>> not allowed to migrate to unstable and testing. We are still months
>> away from feature freeze in wheezy and mesa 8.0 brings quite a few
>> feature, mainly opengl 3.0 capabilities for some intel gpus.
>
> uploading to sid means disabling wayland support, so it's not
> straightforward (i.e. not a dch -i/build/upload away).
The following patch removes disables wayland support, but I guess adding
Conflicts or Breaks against packages which actually need the wayland
support (i.e. weston) would also be necessary.
Cheers,
Sven
diff --git a/debian/control b/debian/control
index ec59840..b3a5145 100644
--- a/debian/control
+++ b/debian/control
@@ -31,7 +31,6 @@ Build-Depends:
flex,
bison,
llvm-2.9-dev [amd64 i386 kfreebsd-amd64 kfreebsd-i386],
- libwayland-dev (>= 0.85.0) [linux-any],
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.linux.in b/debian/libegl1-mesa-dev.install.linux.in
index 5ccc738..a6e9a74 100644
--- a/debian/libegl1-mesa-dev.install.linux.in
+++ b/debian/libegl1-mesa-dev.install.linux.in
@@ -3,7 +3,3 @@ dri/usr/lib/${DEB_HOST_MULTIARCH}/libEGL.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
-
-# Wayland support, only on Linux:
-dri/usr/lib/${DEB_HOST_MULTIARCH}/libwayland-egl.so usr/lib/${DEB_HOST_MULTIARCH}
-dri/usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/wayland-egl.pc usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig
diff --git a/debian/libegl1-mesa-drivers.install.linux.in b/debian/libegl1-mesa-drivers.install.linux.in
index 5001e0a..741f962 100644
--- a/debian/libegl1-mesa-drivers.install.linux.in
+++ b/debian/libegl1-mesa-drivers.install.linux.in
@@ -1,6 +1,2 @@
# OS-independent part (from libegl1-mesa-drivers.install.in):
dri/usr/lib/${DEB_HOST_MULTIARCH}/egl/egl_gallium.so usr/lib/${DEB_HOST_MULTIARCH}/egl
-
-# Wayland support, only on Linux:
-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 cc73326..3accc3d 100644
--- a/debian/libegl1-mesa.symbols
+++ b/debian/libegl1-mesa.symbols
@@ -63,4 +63,3 @@ libEGL.so.1 libegl1-mesa #MINVER# | libegl1-x11
eglWaitClient@Base 7.8.1
eglWaitGL@Base 7.8.1
eglWaitNative@Base 7.8.1
- (arch=linux-any)wl_drm_interface@Base 8.0-2~
diff --git a/debian/rules b/debian/rules
index 3bf3702..ec87fac 100755
--- a/debian/rules
+++ b/debian/rules
@@ -81,8 +81,6 @@ else
# Although the KMS egl drivers will probably build on kfreebsd & hurd
# only linux actually has KMS drivers implemented at this point.
EGL_DISPLAYS += drm
-# Non-Linux ports also lack *_CLOEXEC and epoll, so wayland isn't ready yet:
- EGL_DISPLAYS += wayland
ifeq (,$(filter $(DEB_HOST_ARCH), s390 s390x))
DRI_DRIVERS += r200 radeon nouveau
endif
Reply to: