mesa: Changes to 'debian-unstable'
debian/changelog | 8 ++++++++
debian/patches/01_gbm_egl.diff | 14 ++++++++++++++
debian/patches/02_gbm_no_undefined.diff | 22 ++++++++++++++++++++++
debian/patches/series | 2 ++
4 files changed, 46 insertions(+)
New commits:
commit 012d959a18d229601de040d8d557572330809eb9
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Jun 25 21:33:41 2013 +0200
Make sure libgbm doesn't have undefined symbols.
diff --git a/debian/changelog b/debian/changelog
index 8b29634..f1ed842 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ mesa (9.1.3-7) UNRELEASED; urgency=low
* Don't call wayland_buffer_is_drm from libgbm, it's in libEGL
(closes: #712556).
+ * Make sure libgbm doesn't have undefined symbols.
-- Julien Cristau <jcristau@debian.org> Tue, 25 Jun 2013 21:26:56 +0200
diff --git a/debian/patches/02_gbm_no_undefined.diff b/debian/patches/02_gbm_no_undefined.diff
new file mode 100644
index 0000000..abb6507
--- /dev/null
+++ b/debian/patches/02_gbm_no_undefined.diff
@@ -0,0 +1,22 @@
+diff --git a/src/gbm/Makefile.am b/src/gbm/Makefile.am
+index e22c55c..556eb03 100644
+--- a/src/gbm/Makefile.am
++++ b/src/gbm/Makefile.am
+@@ -18,7 +18,7 @@ libgbm_la_SOURCES = \
+ main/gbm.c \
+ main/backend.c \
+ main/common.c
+-libgbm_la_LDFLAGS = -version-info 1:0
++libgbm_la_LDFLAGS = -version-info 1:0 -Wl,-z,defs
+ libgbm_la_LIBADD = $(LIBUDEV_LIBS) $(LIBKMS_LIBS) $(DLOPEN_LIBS)
+
+ if HAVE_EGL_PLATFORM_WAYLAND
+@@ -39,6 +39,8 @@ libgbm_dri_la_CFLAGS = \
+
+ libgbm_la_LIBADD += \
+ libgbm_dri.la $(top_builddir)/src/mapi/shared-glapi/libglapi.la
++
++libgbm_la_LDFLAGS += $(LIBDRM_LIBS)
+ endif
+
+ all-local: libgbm.la
diff --git a/debian/patches/series b/debian/patches/series
index f5c7caf..f20129c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,5 @@
01_gbm_egl.diff
+02_gbm_no_undefined.diff
04_osmesa_version.diff
06_kfreebsd-ftbfs.diff
08-kfreebsd-gallium.diff
commit f18181516aef48395304122a804b4f7d036cb73f
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Jun 25 21:30:34 2013 +0200
Don't call wayland_buffer_is_drm from libgbm, it's in libEGL
Closes: #712556
diff --git a/debian/changelog b/debian/changelog
index 2c81409..8b29634 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mesa (9.1.3-7) UNRELEASED; urgency=low
+
+ * Don't call wayland_buffer_is_drm from libgbm, it's in libEGL
+ (closes: #712556).
+
+ -- Julien Cristau <jcristau@debian.org> Tue, 25 Jun 2013 21:26:56 +0200
+
mesa (9.1.3-6) unstable; urgency=low
* Team upload.
diff --git a/debian/patches/01_gbm_egl.diff b/debian/patches/01_gbm_egl.diff
new file mode 100644
index 0000000..10b1493
--- /dev/null
+++ b/debian/patches/01_gbm_egl.diff
@@ -0,0 +1,14 @@
+diff --git a/src/gbm/backends/dri/gbm_dri.c b/src/gbm/backends/dri/gbm_dri.c
+index a3a0530..92d1a36 100644
+--- a/src/gbm/backends/dri/gbm_dri.c
++++ b/src/gbm/backends/dri/gbm_dri.c
+@@ -376,9 +376,6 @@ gbm_dri_bo_import(struct gbm_device *gbm,
+ {
+ struct wl_drm_buffer *wb = (struct wl_drm_buffer *) buffer;
+
+- if (!wayland_buffer_is_drm(buffer))
+- return NULL;
+-
+ image = wb->driver_buffer;
+
+ switch (wb->format) {
diff --git a/debian/patches/series b/debian/patches/series
index cf3211b..f5c7caf 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+01_gbm_egl.diff
04_osmesa_version.diff
06_kfreebsd-ftbfs.diff
08-kfreebsd-gallium.diff
Reply to: