mesa: Changes to 'debian-experimental'
debian/changelog | 6 +++++
debian/control | 18 ++++++++--------
debian/libgbm1.symbols | 15 ++++---------
debian/patches/03_gbm_make_devices_static.diff | 27 +++++++++++++++++++++++++
debian/patches/series | 1
debian/rules | 11 +++-------
6 files changed, 52 insertions(+), 26 deletions(-)
New commits:
commit 24060fe65801091e6c93beb7095f4fb55528d923
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Mar 2 18:10:39 2014 +0100
Don't export a symbol named "devices" from libgbm
diff --git a/debian/patches/03_gbm_make_devices_static.diff b/debian/patches/03_gbm_make_devices_static.diff
new file mode 100644
index 0000000..3b3be9b
--- /dev/null
+++ b/debian/patches/03_gbm_make_devices_static.diff
@@ -0,0 +1,27 @@
+From 5956d0a70600fe3f70282419c3328e68e8b68f1a Mon Sep 17 00:00:00 2001
+From: Julien Cristau <jcristau@debian.org>
+Date: Sun, 2 Mar 2014 17:44:29 +0100
+Subject: [PATCH] gbm: make 'devices' array static
+
+It's only used in this one file, and exporting a symbol named 'devices'
+from a shared library is terribly wrong.
+---
+ src/gbm/main/gbm.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/gbm/main/gbm.c b/src/gbm/main/gbm.c
+index 72eeabf..04cd90c 100644
+--- a/src/gbm/main/gbm.c
++++ b/src/gbm/main/gbm.c
+@@ -43,7 +43,7 @@
+
+ #define ARRAY_SIZE(a) (sizeof(a)/sizeof((a)[0]))
+
+-struct gbm_device *devices[16];
++static struct gbm_device *devices[16];
+
+ static int device_num = 0;
+
+--
+1.9.0
+
diff --git a/debian/patches/series b/debian/patches/series
index dce198a..5da44f2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,6 @@
01_hurd.diff
02_gbm_no_undefined.diff
+03_gbm_make_devices_static.diff
04_osmesa_version.diff
05_fix-defaults-glxfbconfig.patch
06_fix-sort-glxfbconfig.patch
commit e7519c73d80a6937addbffa2b9ddd89ea8dd7d6c
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Mar 2 17:01:19 2014 +0100
libgbm1.symbols: try to avoid listing private symbols
Symbols whose name starts with an underscore, as well as
wl_drm_interface, are not public symbols, so shouldn't be listed here.
diff --git a/debian/changelog b/debian/changelog
index efb315a..7bfb282 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,9 @@ mesa (10.1.0~rc2-1) UNRELEASED; urgency=medium
[ Samuel Thibault ]
* Enable egl and gles on hurd (closes: #729260)
+ [ Julien Cristau ]
+ * libgbm1.symbols: try to avoid listing private symbols.
+
-- Maarten Lankhorst <maarten.lankhorst@ubuntu.com> Thu, 20 Feb 2014 19:12:12 +0100
mesa (10.1.0~rc1-1) experimental; urgency=low
diff --git a/debian/libgbm1.symbols b/debian/libgbm1.symbols
index 7d51566..9a04f8b 100644
--- a/debian/libgbm1.symbols
+++ b/debian/libgbm1.symbols
@@ -1,19 +1,11 @@
libgbm.so.1 libgbm1 #MINVER#
- _gbm_create_device@Base 8.1~0
-# _gbm_fd_get_device_name@Base 7.11~1
-# _gbm_log@Base 7.11~1
- _gbm_mesa_get_device@Base 7.11~1
-# _gbm_udev_device_new_from_fd@Base 7.11~1
- devices@Base 8.1~0
-# dri_fd_get_driver_name@Base 8.1~0
+| libgbm1-private
gbm_bo_create@Base 7.11~1
-#MISSING: 8.1~0 gbm_bo_create_from_egl_image@Base 7.11~1
gbm_bo_destroy@Base 7.11~1
gbm_bo_get_device@Base 8.1~0
gbm_bo_get_format@Base 8.1~0
gbm_bo_get_handle@Base 7.11~1
gbm_bo_get_height@Base 7.11~1
-#MISSING: 8.1~0 gbm_bo_get_pitch@Base 7.11~1
gbm_bo_get_stride@Base 8.1~0
gbm_bo_get_user_data@Base 8.1~0
gbm_bo_get_width@Base 7.11~1
@@ -31,4 +23,7 @@ libgbm.so.1 libgbm1 #MINVER#
gbm_surface_has_free_buffers@Base 8.1~0
gbm_surface_lock_front_buffer@Base 8.1~0
gbm_surface_release_buffer@Base 8.1~0
- (arch=linux-any)wl_drm_interface@Base 9.2~0
+ (regex)"^_gbm_.*@Base$" 0 1
+# stupid side effect of code generation from
+# src/egl/wayland/wayland-drm/wayland-drm.xml which ought to be private.
+ (arch=linux-any)wl_drm_interface@Base 0 1
commit 5d8d13096d5727ed92876391c201389e008d7334
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Mar 2 16:32:00 2014 +0100
Adjust hurd debian/rules changes to make common things common
diff --git a/debian/rules b/debian/rules
index c7cb6ba..86464e6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -51,18 +51,13 @@ include /usr/share/quilt/quilt.make
DRI_DRIVERS =
GALLIUM_DRIVERS =
+EGL_DISPLAYS = x11
# hurd doesn't do direct rendering
ifeq ($(DEB_HOST_ARCH_OS), hurd)
- EGL_DISPLAYS = x11
confflags_DIRECT_RENDERING = --disable-driglx-direct
- confflags_EGL = --with-egl-platforms="$(EGL_DISPLAYS)"
- confflags_GALLIUM = --with-gallium-drivers=
- confflags_GLES = --enable-gles-overlay --enable-gles1 --enable-gles2
DRI_DRIVERS += swrast
else
- EGL_DISPLAYS = x11
-
ifeq ($(DEB_HOST_ARCH_OS), linux)
# Gallium drivers require libdrm-{nouveau,radeon}, only available on Linux
GALLIUM_DRIVERS += nouveau r600 r300 svga
@@ -104,11 +99,11 @@ else
endif
confflags_DIRECT_RENDERING = --enable-driglx-direct
- confflags_EGL = --with-egl-platforms="$(EGL_DISPLAYS)"
- confflags_GALLIUM += --with-gallium-drivers="$(GALLIUM_DRIVERS)"
- confflags_GLES = --enable-gles1 --enable-gles2
confflags_OPENVG = --enable-openvg --enable-gallium-egl
endif
+confflags_EGL = --with-egl-platforms="$(EGL_DISPLAYS)"
+confflags_GLES = --enable-gles1 --enable-gles2
+confflags_GALLIUM += --with-gallium-drivers="$(GALLIUM_DRIVERS)"
confflags-dri = \
--enable-dri \
commit 9ca9b0e0d208fa31d525af21c13cfffc3e6781a5
Author: Samuel Thibault <sthibault@debian.org>
Date: Sun Mar 2 16:15:19 2014 +0100
Enable egl and gles on hurd (closes: #729260)
diff --git a/debian/changelog b/debian/changelog
index 3f82a07..efb315a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,9 @@ mesa (10.1.0~rc2-1) UNRELEASED; urgency=medium
* Attempt to fix FTBFS on hurd.
* Cherry pick some fixes for GLX fbconfig. (Closes: #739691)
+ [ Samuel Thibault ]
+ * Enable egl and gles on hurd (closes: #729260)
+
-- Maarten Lankhorst <maarten.lankhorst@ubuntu.com> Thu, 20 Feb 2014 19:12:12 +0100
mesa (10.1.0~rc1-1) experimental; urgency=low
diff --git a/debian/control b/debian/control
index 7a0a2ee..c057086 100644
--- a/debian/control
+++ b/debian/control
@@ -246,7 +246,7 @@ Description: generic buffer management API -- development files
Package: libegl1-mesa
Section: libs
-Architecture: linux-any kfreebsd-any
+Architecture: any
Depends:
${shlibs:Depends},
${misc:Depends},
@@ -268,7 +268,7 @@ Description: free implementation of the EGL API -- runtime
Package: libegl1-mesa-dbg
Section: debug
Priority: extra
-Architecture: linux-any kfreebsd-any
+Architecture: any
Depends:
libegl1-mesa (= ${binary:Version}),
${misc:Depends},
@@ -282,7 +282,7 @@ Description: free implementation of the EGL API -- debugging symbols
Package: libegl1-mesa-dev
Section: libdevel
-Architecture: linux-any kfreebsd-any
+Architecture: any
Depends:
libegl1-mesa (= ${binary:Version}),
libegl1-mesa-drivers (= ${binary:Version}),
@@ -438,7 +438,7 @@ Description: free implementation of the OpenVG API -- development files
Package: libgles1-mesa
Section: libs
-Architecture: linux-any kfreebsd-any
+Architecture: any
Depends:
libglapi-mesa (= ${binary:Version}),
${shlibs:Depends},
@@ -459,7 +459,7 @@ Description: free implementation of the OpenGL|ES 1.x API -- runtime
Package: libgles1-mesa-dbg
Section: debug
Priority: extra
-Architecture: linux-any kfreebsd-any
+Architecture: any
Depends:
libgles1-mesa (= ${binary:Version}),
${misc:Depends},
@@ -476,7 +476,7 @@ Description: free implementation of the OpenGL|ES 1.x API -- debugging symbols
Package: libgles1-mesa-dev
Section: libdevel
-Architecture: linux-any kfreebsd-any
+Architecture: any
Depends:
libgles1-mesa (= ${binary:Version}),
libegl1-mesa-dev,
@@ -494,7 +494,7 @@ Description: free implementation of the OpenGL|ES 1.x API -- development files
Package: libgles2-mesa
Section: libs
-Architecture: linux-any kfreebsd-any
+Architecture: any
Depends:
libglapi-mesa (= ${binary:Version}),
${shlibs:Depends},
@@ -516,7 +516,7 @@ Description: free implementation of the OpenGL|ES 2.x API -- runtime
Package: libgles2-mesa-dbg
Section: debug
Priority: extra
-Architecture: linux-any kfreebsd-any
+Architecture: any
Depends:
libgles2-mesa (= ${binary:Version}),
${misc:Depends},
@@ -534,7 +534,7 @@ Description: free implementation of the OpenGL|ES 2.x API -- debugging symbols
Package: libgles2-mesa-dev
Section: libdevel
-Architecture: linux-any kfreebsd-any
+Architecture: any
Depends:
libgles2-mesa (= ${binary:Version}),
libegl1-mesa-dev,
diff --git a/debian/rules b/debian/rules
index e8a3bfa..c7cb6ba 100755
--- a/debian/rules
+++ b/debian/rules
@@ -54,9 +54,11 @@ GALLIUM_DRIVERS =
# hurd doesn't do direct rendering
ifeq ($(DEB_HOST_ARCH_OS), hurd)
+ EGL_DISPLAYS = x11
confflags_DIRECT_RENDERING = --disable-driglx-direct
- confflags_EGL = --disable-egl
+ confflags_EGL = --with-egl-platforms="$(EGL_DISPLAYS)"
confflags_GALLIUM = --with-gallium-drivers=
+ confflags_GLES = --enable-gles-overlay --enable-gles1 --enable-gles2
DRI_DRIVERS += swrast
else
EGL_DISPLAYS = x11
Reply to: