mesa: Changes to 'ubuntu'
debian/README.Debian | 18 ++++++++++++++++++
debian/changelog | 12 ++++++++++++
debian/control | 12 ++++++++++++
debian/libegl1-mesa.symbols | 2 +-
debian/libgles1-mesa.symbols | 2 +-
debian/libgles2-mesa.symbols | 2 +-
debian/libopenvg1-mesa.symbols | 2 +-
7 files changed, 46 insertions(+), 4 deletions(-)
New commits:
commit 99bb7ba2c18faf9bfde660cc44d43a43a43b6749
Author: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
Date: Tue Aug 10 12:41:37 2010 +1000
Changelog entry for EGL virtual packages
diff --git a/debian/changelog b/debian/changelog
index 1a35367..ccc6918 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
-mesa (7.8.2-3) UNRELEASED; urgency=low
+mesa (7.8.2-2ubuntu2) maverick; urgency=low
+ * Cherry-pick EGL/GL|ES/OpenVG virtual packages from Debian experimental git
* debian/control:
- Add EGL, GLESv1, GLESv2, and OpenVG virtual packages. The Khronos group
specifies a de-facto linux ABI for these libraries. We have a similar
commit 51ce16be98af3442cca8a055a12ad7907b6dd906
Author: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
Date: Mon Aug 2 12:58:29 2010 +1000
Actually add README.Debian. Urgh.
(cherry picked from commit 2f498183c2b6138d6da3f7bc40dd4fe3f99cf247)
diff --git a/debian/README.Debian b/debian/README.Debian
new file mode 100644
index 0000000..f3514bf
--- /dev/null
+++ b/debian/README.Debian
@@ -0,0 +1,18 @@
+Documentation for the libegl1-x11, libgles1, libgles2, and libopenvg1 virtual
+packages.
+
+Although there are is no standardised linux ABI for GL|ES or OpenVG, there is
+a “strongly encouraged” set of standard headers, type and linkage definitions
+supplied by the Khronos group[1]. The mesa implementation provides this ABI.
+Any non-mesa implementation that wants to provide these packages should
+conform to the Khronos group's de-facto ABI.
+
+The case of EGL is similar; Khronos again supplies a de-facto linux ABI.
+The EGL ABI is necessarily tied to the native windowing system by the
+eglNativeDisplayType, eglNativeWindowType, and eglNativePixmapType typedefs.
+The EGL virtual package therefore includes the name of the x11 windowing
+system to leave room should further windowing ABIs be standardised.
+
+[1]: http://www.khronos.org/registry/implementers_guide.html#uncontrolled
+
+ -- Christopher James Halse Rogers <raof@ubuntu.com>, Fri, 30 Jul 2010 17:55:56 +1000
commit 7701fb3baf4f409ce1fae0fabcc5034f44bfb501
Author: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
Date: Mon Aug 2 12:39:23 2010 +1000
Fix libegl1-mesa.symbols to point to correct libegl1-x11 alternative
(cherry picked from commit e97a55090450cbbcc1d7f99849a2eb9f2a6ae0bc)
diff --git a/debian/libegl1-mesa.symbols b/debian/libegl1-mesa.symbols
index 70eb596..eca1496 100644
--- a/debian/libegl1-mesa.symbols
+++ b/debian/libegl1-mesa.symbols
@@ -1,4 +1,4 @@
-libEGL.so.1 libegl1-mesa #MINVER# | libegl1
+libEGL.so.1 libegl1-mesa #MINVER# | libegl1-x11
_eglAddConfig@Base 7.8.1
_eglAddNewMode@Base 7.8.1
_eglAddScreen@Base 7.8.1
commit ec3d6cd656feb687c9f4f51e8377fc69006ab0f8
Author: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
Date: Mon Aug 2 12:03:23 2010 +1000
Add EGL, GL|ES and OpenVG virtual packages
(cherry picked from commit 0e192029e328e285ec3bbe2357f92b8599b9fcbf)
diff --git a/debian/changelog b/debian/changelog
index d6e846a..1a35367 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+mesa (7.8.2-3) UNRELEASED; urgency=low
+
+ * debian/control:
+ - Add EGL, GLESv1, GLESv2, and OpenVG virtual packages. The Khronos group
+ specifies a de-facto linux ABI for these libraries. We have a similar
+ package for libgl1.
+ * debian/README.Debian:
+ - Document the virtual packages above.
+
+ -- Christopher James Halse Rogers <raof@ubuntu.com> Fri, 30 Jul 2010 19:08:57 +1000
+
mesa (7.8.2-2ubuntu1) maverick; urgency=low
* Merge from Debian experimental. Remaining Ubuntu changes:
diff --git a/debian/control b/debian/control
index 0ec2273..9309c71 100644
--- a/debian/control
+++ b/debian/control
@@ -124,6 +124,9 @@ Depends:
${shlibs:Depends},
${misc:Depends},
Recommends: libegl1-mesa-drivers-x11
+Provides: libegl1-x11
+Conflicts: libegl1-x11
+Replaces: libegl1-x11
Description: A 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
@@ -238,6 +241,9 @@ Architecture: any
Depends:
${shlibs:Depends},
${misc:Depends},
+Provides: libopenvg1
+Conflicts: libopenvg1
+Replaces: libopenvg1
Description: A free implementation of the OpenVG API -- runtime
This package contains the mesa implementation of the OpenVG 2D acceleration
library. OpenVG provides a device independent and vendor-neutral interface
@@ -284,6 +290,9 @@ Architecture: any
Depends:
${shlibs:Depends},
${misc:Depends},
+Provides: libgles1
+Conflicts: libgles1
+Replaces: libgles1
Description: A free implementation of the OpenGL|ES 1.x API -- runtime
OpenGL|ES is a cross-platform API for full-function 2D and 3D graphics on
embedded systems - including consoles, phones, appliances and vehicles.
@@ -333,6 +342,9 @@ Architecture: any
Depends:
${shlibs:Depends},
${misc:Depends},
+Provides: libgles2
+Conflicts: libgles2
+Replaces: libgles2
Description: A free implementation of the OpenGL|ES 2.x API -- runtime
OpenGL|ES is a cross-platform API for full-function 2D and 3D graphics on
embedded systems - including consoles, phones, appliances and vehicles.
diff --git a/debian/libegl1-mesa.symbols b/debian/libegl1-mesa.symbols
index 1c35b7f..70eb596 100644
--- a/debian/libegl1-mesa.symbols
+++ b/debian/libegl1-mesa.symbols
@@ -1,4 +1,4 @@
-libEGL.so.1 libegl1-mesa #MINVER#
+libEGL.so.1 libegl1-mesa #MINVER# | libegl1
_eglAddConfig@Base 7.8.1
_eglAddNewMode@Base 7.8.1
_eglAddScreen@Base 7.8.1
diff --git a/debian/libgles1-mesa.symbols b/debian/libgles1-mesa.symbols
index 84c35ef..6cdd51b 100644
--- a/debian/libgles1-mesa.symbols
+++ b/debian/libgles1-mesa.symbols
@@ -1,4 +1,4 @@
-libGLESv1_CM.so.1 libgles1-mesa #MINVER#
+libGLESv1_CM.so.1 libgles1-mesa #MINVER# | libgles1
# _glapi_* are internal GL dispatch symbols. They should probably be hidden
(regex)"^_glapi_.*@Base$" 7.8.1
# These are optimised assembly versions of functions, accessed through a
diff --git a/debian/libgles2-mesa.symbols b/debian/libgles2-mesa.symbols
index f19a2de..26a2db9 100644
--- a/debian/libgles2-mesa.symbols
+++ b/debian/libgles2-mesa.symbols
@@ -1,4 +1,4 @@
-libGLESv2.so.2 libgles2-mesa #MINVER#
+libGLESv2.so.2 libgles2-mesa #MINVER# | libgles2
# _glapi_* are internal GL dispatch symbols. They should probably be hidden.
(regex)"^_glapi_.*@Base$" 7.8.1
# These are optimised assembly versions of functions, accessed through a
diff --git a/debian/libopenvg1-mesa.symbols b/debian/libopenvg1-mesa.symbols
index 908524e..2290ca3 100644
--- a/debian/libopenvg1-mesa.symbols
+++ b/debian/libopenvg1-mesa.symbols
@@ -1,4 +1,4 @@
-libOpenVG.so.1 libopenvg1-mesa #MINVER#
+libOpenVG.so.1 libopenvg1-mesa #MINVER# | libopenvg1
st_api_OpenVG@Base 7.8.1
st_bind_texture_surface@Base 7.8.1
st_copy_context_state@Base 7.8.1
Reply to: