Bug#739269: Please move libwayland-egl out of libegl1-mesa-drivers
On Mon, 2014-03-03 at 14:20 +0100, Julien Cristau wrote:
> > I did keep the .so/.pc etc in libegl1-mesa-dev (as they are currently)
> > as libwayland-egl is both conceptually part of the EGL stack and tiny
> > (the .h is not even 60 lines). I'm happy to update the patch to split it
> > out into its own package as well though (as well as correct the other
> > issues you've noted)
> >
> I'm ok with keeping the -dev stuff within libegl1-mesa-dev if that's
> easier or less wasteful. And I'll be happy to apply and upload a new
> version with the transition issue and package descriptions fixed.
I think it is, attached is a fixed version. I've left it in two patches
to make the difference more clear the first is just the revert of your
reversion, second patch is the actual changes to address the concerns
you raised above.
I've also left the -dev stuff in libegl1-mesa-dev as i do indeed think
it's less wasteful.
--
Sjoerd Simons <sjoerd@debian.org>
From 602fe89daebf498c2a120db7226ef3ec9e172a7f Mon Sep 17 00:00:00 2001
From: Sjoerd Simons <sjoerd@luon.net>
Date: Sun, 16 Mar 2014 22:07:07 +0100
Subject: [PATCH 1/2] Install libwayland-egl in a seperate library package
(libwayland-egl1-mesa) and provide a virtual libwayland-egl1 package.
(Closes: #739269).
---
debian/changelog | 7 +++++
debian/control | 38 ++++++++++++++++++++++++++++
debian/libegl1-mesa-drivers.install.linux.in | 4 ---
debian/libwayland-egl1-mesa.install.in | 3 +++
debian/libwayland-egl1-mesa.symbols | 5 ++++
5 files changed, 53 insertions(+), 4 deletions(-)
create mode 100644 debian/libwayland-egl1-mesa.install.in
create mode 100644 debian/libwayland-egl1-mesa.symbols
diff --git a/debian/changelog b/debian/changelog
index c34f774..219b25f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mesa (10.1.0-2) UNRELEASED; urgency=medium
+
+ * Install libwayland-egl in a seperate library package (libwayland-egl1-mesa)
+ and provide a virtual libwayland-egl1 package. (Closes: #739269).
+
+ -- Sjoerd Simons <sjoerd@debian.org> Sun, 16 Mar 2014 22:03:02 +0100
+
mesa (10.1.0-1) experimental; urgency=low
[ Andreas Boll ]
diff --git a/debian/control b/debian/control
index ed08431..a58be87 100644
--- a/debian/control
+++ b/debian/control
@@ -322,6 +322,9 @@ Depends:
${misc:Depends},
libegl1-mesa (= ${binary:Version}),
libglapi-mesa (= ${binary:Version}),
+ libwayland-egl1-mesa (= ${binary:Version}),
+# for libllvmradeon
+ libgl1-mesa-dri (= ${binary:Version}) [any-i386 any-amd64],
Pre-Depends: ${misc:Pre-Depends}
Multi-Arch: same
Description: free implementation of the EGL API -- hardware drivers
@@ -348,6 +351,41 @@ Description: free implementation of the EGL API -- driver debugging symbols
This package contains the debugging symbols for the drivers required for
hardware accelerated rendering of EGL-based graphics libraries.
+Package: libwayland-egl1-mesa
+Section: libs
+Architecture: linux-any
+Depends:
+ ${shlibs:Depends},
+ ${misc:Depends},
+ libegl1-mesa (= ${binary:Version})
+Recommends: libegl1-mesa-drivers
+Provides: libwayland-egl1
+Conflicts: libwayland-egl1
+Replaces: libwayland-egl1
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
+Description: free implementation of the EGL API -- runtime
+ This package contains the EGL native platform graphics interface library.
+ EGL provides a platform-agnostic mechanism for creating rendering surfaces
+ for use with other graphics libraries, such as OpenGL|ES and OpenVG.
+ .
+ This package contains wayland specific interface for use with EGL.
+
+Package: libwayland-egl1-mesa-dbg
+Section: debug
+Priority: extra
+Architecture: linux-any
+Depends:
+ libwayland-egl1-mesa (= ${binary:Version}),
+ ${misc:Depends},
+Multi-Arch: same
+Description: free implementation of the EGL API -- debugging symbols
+ This package contains the EGL native platform graphics interface library.
+ EGL provides a platform-agnostic mechanism for creating rendering surfaces
+ for use with other graphics libraries, such as OpenGL|ES and OpenVG.
+ .
+ This package contains the debugging symbols for the wayland EGL library.
+
Package: libopenvg1-mesa
Section: libs
Architecture: linux-any kfreebsd-any
diff --git a/debian/libegl1-mesa-drivers.install.linux.in b/debian/libegl1-mesa-drivers.install.linux.in
index 2c4c266..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.0 usr/lib/${DEB_HOST_MULTIARCH}
diff --git a/debian/libwayland-egl1-mesa.install.in b/debian/libwayland-egl1-mesa.install.in
new file mode 100644
index 0000000..9adea44
--- /dev/null
+++ b/debian/libwayland-egl1-mesa.install.in
@@ -0,0 +1,3 @@
+# 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.0 usr/lib/${DEB_HOST_MULTIARCH}
diff --git a/debian/libwayland-egl1-mesa.symbols b/debian/libwayland-egl1-mesa.symbols
new file mode 100644
index 0000000..4ec0edc
--- /dev/null
+++ b/debian/libwayland-egl1-mesa.symbols
@@ -0,0 +1,5 @@
+libwayland-egl.so.1 libwayland-egl1-mesa #MINVER# | libwayland-egl1
+ wl_egl_window_create@Base 10.0.2
+ wl_egl_window_destroy@Base 10.0.2
+ wl_egl_window_get_attached_size@Base 10.0.2
+ wl_egl_window_resize@Base 10.0.2
--
1.9.0
From 2d5479411b4f3a16637e646dc1e61dd8f1d81a37 Mon Sep 17 00:00:00 2001
From: Sjoerd Simons <sjoerd@luon.net>
Date: Mon, 17 Mar 2014 10:54:19 +0100
Subject: [PATCH 2/2] libwayland-egl1-mesa: Add breaks/replaces and improve
description
Add breaks & replaces to libegl1-mesa-drivers to ensure upgrades work
successfully as libwayland-egl1-mesa replaces files in that package and
improve the description
---
debian/control | 20 +++++++-------------
1 file changed, 7 insertions(+), 13 deletions(-)
diff --git a/debian/control b/debian/control
index a58be87..69e4497 100644
--- a/debian/control
+++ b/debian/control
@@ -361,15 +361,12 @@ Depends:
Recommends: libegl1-mesa-drivers
Provides: libwayland-egl1
Conflicts: libwayland-egl1
-Replaces: libwayland-egl1
+Replaces: libwayland-egl1, libegl1-mesa-drivers (<< 10.1.0-2)
+Breaks: libegl1-mesa-drivers (<< 10.1.0-2)
Pre-Depends: ${misc:Pre-Depends}
Multi-Arch: same
-Description: free implementation of the EGL API -- runtime
- This package contains the EGL native platform graphics interface library.
- EGL provides a platform-agnostic mechanism for creating rendering surfaces
- for use with other graphics libraries, such as OpenGL|ES and OpenVG.
- .
- This package contains wayland specific interface for use with EGL.
+Description: implementation of the Wayland EGL platform -- runtime
+ This package contains the mesa implementation of the Wayland EGL platform
Package: libwayland-egl1-mesa-dbg
Section: debug
@@ -379,12 +376,9 @@ Depends:
libwayland-egl1-mesa (= ${binary:Version}),
${misc:Depends},
Multi-Arch: same
-Description: free implementation of the EGL API -- debugging symbols
- This package contains the EGL native platform graphics interface library.
- EGL provides a platform-agnostic mechanism for creating rendering surfaces
- for use with other graphics libraries, such as OpenGL|ES and OpenVG.
- .
- This package contains the debugging symbols for the wayland EGL library.
+Description: implementation of the Wayland EGL platform -- debugging symbols
+ This package contains the debugging symbols for the mesa implementation of the
+ Wayland EGL platform
Package: libopenvg1-mesa
Section: libs
--
1.9.0
Reply to: