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 From 602fe89daebf498c2a120db7226ef3ec9e172a7f Mon Sep 17 00:00:00 2001 From: Sjoerd Simons 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 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 000..9adea44 --- /dev/null +++
Bug#739269: Please move libwayland-egl out of libegl1-mesa-drivers
On 2014-02-17 11:48 +0100, Sjoerd Simons wrote: > Package: libegl1-mesa-drivers > Severity: normal > > libwayland-egl has been included in the libegl1-mesa-drivers, which seems a > bit > odd as it's an application library not a driver. > > Practically this causes an issue on systems where wayland is used but the > EGL/GL stack isn't provided by mesa as applications using libwayland-egl > depend > on libegl1-mesa-drivers which almost forcibly pulls in mesa. For the record, that last part is due to libegl1-mesa-drivers depending on libgl1-mesa-dri, a dependency that I have just removed in git. The reason why it was introduced (#714828) no longer applies. Cheers, Sven -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: https://lists.debian.org/87ob1kfkt5@turtle.gmx.de
Bug#739269: Please move libwayland-egl out of libegl1-mesa-drivers
On Mon, Mar 3, 2014 at 09:49:50 +0100, Sjoerd Simons wrote: > It's meant to be used externally indeed. Any Wayland application that > uses EGL/GLES2 should use it to e.g. transform a wayland surface into an > EGLNativeWindow for use with the EGL stack. > Right, sorry, that was a misunderstanding on my part. > 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. Cheers, Julien signature.asc Description: Digital signature
Bug#739269: Please move libwayland-egl out of libegl1-mesa-drivers
On Sun, 2014-03-02 at 20:34 +0100, Julien Cristau wrote: > On Sun, Mar 2, 2014 at 19:09:50 +0100, Julien Cristau wrote: > > > On Mon, Feb 17, 2014 at 14:50:48 +0100, Sjoerd Simons wrote: > > > > > diff --git a/debian/control b/debian/control > > > index 4577639..de02e96 100644 > > > --- a/debian/control > > > +++ b/debian/control > > > @@ -308,6 +308,7 @@ 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} > > > @@ -320,6 +321,41 @@ Description: free implementation of the EGL API -- > > > hardware drivers > > > This package contains the drivers required for hardware accelerated > > > rendering > > > of EGL-based graphics libraries, such as OpenGL|ES and OpenVG. > > > > > > +Package: libwayland-egl1-mesa > > > +Section: libs > > > +Architecture: linux-any > > > +Depends: > > > + ${shlibs:Depends}, > > > + ${misc:Depends}, > > > + libegl1-mesa (= ${binary:Version}) > > > +Recommends: libegl1-mesa-drivers > > > +Provides: libwayland-egl > > > +Conflicts: libwayland-egl1 > > > +Replaces: libwayland-egl1 > > > > This looks broken. If this new package contains files split out of > > libegl1-mesa-drivers then it needs to replace its old versions, at the > > very least. Can somebody please fix this (and test the upgrade path)? > > > > > +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. > > > + > > Also the short description is the one from libegl, which is not > appropriate here. > > And I'm thinking splitting out a -dev package might be useful if this > lib is supposed to be used externally. If not, we shouldn't ship a .pc > file and a .so symlink. It's meant to be used externally indeed. Any Wayland application that uses EGL/GLES2 should use it to e.g. transform a wayland surface into an EGLNativeWindow for use with the EGL stack. 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) -- Sjoerd Simons -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: https://lists.debian.org/1393836590.12561.7.ca...@dusk.luon.net
Bug#739269: Please move libwayland-egl out of libegl1-mesa-drivers
On Sun, Mar 2, 2014 at 19:09:50 +0100, Julien Cristau wrote: > On Mon, Feb 17, 2014 at 14:50:48 +0100, Sjoerd Simons wrote: > > > diff --git a/debian/control b/debian/control > > index 4577639..de02e96 100644 > > --- a/debian/control > > +++ b/debian/control > > @@ -308,6 +308,7 @@ 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} > > @@ -320,6 +321,41 @@ Description: free implementation of the EGL API -- > > hardware drivers > > This package contains the drivers required for hardware accelerated > > rendering > > of EGL-based graphics libraries, such as OpenGL|ES and OpenVG. > > > > +Package: libwayland-egl1-mesa > > +Section: libs > > +Architecture: linux-any > > +Depends: > > + ${shlibs:Depends}, > > + ${misc:Depends}, > > + libegl1-mesa (= ${binary:Version}) > > +Recommends: libegl1-mesa-drivers > > +Provides: libwayland-egl > > +Conflicts: libwayland-egl1 > > +Replaces: libwayland-egl1 > > This looks broken. If this new package contains files split out of > libegl1-mesa-drivers then it needs to replace its old versions, at the > very least. Can somebody please fix this (and test the upgrade path)? > > > +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. > > + Also the short description is the one from libegl, which is not appropriate here. And I'm thinking splitting out a -dev package might be useful if this lib is supposed to be used externally. If not, we shouldn't ship a .pc file and a .so symlink. I've reverted this change pending clarification/fixes. Cheers, Julien > > +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: libegl1-mesa-drivers-dbg > > Section: debug > > Priority: extra > > Cheers, > Julien signature.asc Description: Digital signature
Bug#739269: Please move libwayland-egl out of libegl1-mesa-drivers
On Mon, Feb 17, 2014 at 14:50:48 +0100, Sjoerd Simons wrote: > diff --git a/debian/control b/debian/control > index 4577639..de02e96 100644 > --- a/debian/control > +++ b/debian/control > @@ -308,6 +308,7 @@ 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} > @@ -320,6 +321,41 @@ Description: free implementation of the EGL API -- > hardware drivers > This package contains the drivers required for hardware accelerated > rendering > of EGL-based graphics libraries, such as OpenGL|ES and OpenVG. > > +Package: libwayland-egl1-mesa > +Section: libs > +Architecture: linux-any > +Depends: > + ${shlibs:Depends}, > + ${misc:Depends}, > + libegl1-mesa (= ${binary:Version}) > +Recommends: libegl1-mesa-drivers > +Provides: libwayland-egl > +Conflicts: libwayland-egl1 > +Replaces: libwayland-egl1 This looks broken. If this new package contains files split out of libegl1-mesa-drivers then it needs to replace its old versions, at the very least. Can somebody please fix this (and test the upgrade path)? > +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: libegl1-mesa-drivers-dbg > Section: debug > Priority: extra Cheers, Julien signature.asc Description: Digital signature
Bug#739269: Please move libwayland-egl out of libegl1-mesa-drivers
Hi, On 17/02/14 14:50, Sjoerd Simons wrote: > On Mon, 2014-02-17 at 12:17 +0100, Emilio Pozuelo Monfort wrote: >> > On 17/02/14 11:48, Sjoerd Simons wrote: >>> > > Package: libegl1-mesa-drivers >>> > > Severity: normal >>> > > >>> > > libwayland-egl has been included in the libegl1-mesa-drivers, which >>> > > seems a bit >>> > > odd as it's an application library not a driver. >>> > > >>> > > Practically this causes an issue on systems where wayland is used but >>> > > the >>> > > EGL/GL stack isn't provided by mesa as applications using >>> > > libwayland-egl depend >>> > > on libegl1-mesa-drivers which almost forcibly pulls in mesa. >> > >> > How would alternative implementations satisfy the dependency? Should we >> > name the >> > package libwayland-egl1-mesa, and have the shlibs force a dependency on >> > "libwayland-egl1-mesa | libwayland-egl1-provider" (or similar) ? > Yeah same as libegl1-mesa has | libegl1-x11 by its symbols file. > Attached is a patch that splits out the library in that way, but keeps > the library & pkg-config files as part of libegl1-mesa-dev Cool, let's do this. There was a typo in the Provides (libwayland-egl). I have fixed that and removed the debian revision from the symbols file and committed that. Emilio -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/53089f7d.8000...@debian.org
Bug#739269: Please move libwayland-egl out of libegl1-mesa-drivers
On Mon, 2014-02-17 at 12:17 +0100, Emilio Pozuelo Monfort wrote: > On 17/02/14 11:48, Sjoerd Simons wrote: > > Package: libegl1-mesa-drivers > > Severity: normal > > > > libwayland-egl has been included in the libegl1-mesa-drivers, which seems a > > bit > > odd as it's an application library not a driver. > > > > Practically this causes an issue on systems where wayland is used but the > > EGL/GL stack isn't provided by mesa as applications using libwayland-egl > > depend > > on libegl1-mesa-drivers which almost forcibly pulls in mesa. > > How would alternative implementations satisfy the dependency? Should we name > the > package libwayland-egl1-mesa, and have the shlibs force a dependency on > "libwayland-egl1-mesa | libwayland-egl1-provider" (or similar) ? Yeah same as libegl1-mesa has | libegl1-x11 by its symbols file. Attached is a patch that splits out the library in that way, but keeps the library & pkg-config files as part of libegl1-mesa-dev -- Sjoerd Simons From 1eee70da2ea48d844fb09695b33a9391b043ff3b Mon Sep 17 00:00:00 2001 From: Sjoerd Simons Date: Mon, 17 Feb 2014 12:47:53 +0100 Subject: [PATCH] Install libwayland-egl in a seperate library package --- debian/changelog | 7 ++ debian/control | 36 debian/libegl1-mesa-drivers.install.linux.in | 4 debian/libwayland-egl1-mesa.install.in | 4 debian/libwayland-egl1-mesa.symbols | 5 5 files changed, 52 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 94224fd..eb18369 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +mesa (10.0.2-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 Mon, 17 Feb 2014 12:43:29 +0100 + mesa (10.0.2-1) experimental; urgency=low [ Maarten Lankhorst ] diff --git a/debian/control b/debian/control index 4577639..de02e96 100644 --- a/debian/control +++ b/debian/control @@ -308,6 +308,7 @@ 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} @@ -320,6 +321,41 @@ Description: free implementation of the EGL API -- hardware drivers This package contains the drivers required for hardware accelerated rendering of EGL-based graphics libraries, such as OpenGL|ES and OpenVG. +Package: libwayland-egl1-mesa +Section: libs +Architecture: linux-any +Depends: + ${shlibs:Depends}, + ${misc:Depends}, + libegl1-mesa (= ${binary:Version}) +Recommends: libegl1-mesa-drivers +Provides: libwayland-egl +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: libegl1-mesa-drivers-dbg Section: debug Priority: extra 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 000..1937dc6 --- /dev/null +++ b/debian/libwayland-egl1-mesa.install.in @@ -0,0 +1,4 @@ +# Wayland support, only on Linux: +dri/usr/lib/${DEB_HOST_MULTIARCH}/libwayland-
Bug#739269: Please move libwayland-egl out of libegl1-mesa-drivers
On 17/02/14 11:48, Sjoerd Simons wrote: > Package: libegl1-mesa-drivers > Severity: normal > > libwayland-egl has been included in the libegl1-mesa-drivers, which seems a > bit > odd as it's an application library not a driver. > > Practically this causes an issue on systems where wayland is used but the > EGL/GL stack isn't provided by mesa as applications using libwayland-egl > depend > on libegl1-mesa-drivers which almost forcibly pulls in mesa. How would alternative implementations satisfy the dependency? Should we name the package libwayland-egl1-mesa, and have the shlibs force a dependency on "libwayland-egl1-mesa | libwayland-egl1-provider" (or similar) ? Emilio -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/5301efbc.6020...@gmail.com