From b213017b8cb04bcc7b9c67ee3210e48013bf0bf6 Mon Sep 17 00:00:00 2001 From: Andreas Oberritter Date: Wed, 9 Apr 2014 20:28:14 +0200 Subject: [PATCH] mesa-gl: update bbappend for 9.2.5 --- .../mesa/mesa-gl-9.1.6/01_gbm_egl.patch | 23 --------------- .../mesa-gl-9.1.6/02_gbm_no_undefined.patch | 29 ------------------- ...a-gl_9.1.6.bbappend => mesa-gl_%.bbappend} | 10 ------- 3 files changed, 62 deletions(-) delete mode 100644 meta-opendreambox/recipes-graphics/mesa/mesa-gl-9.1.6/01_gbm_egl.patch delete mode 100644 meta-opendreambox/recipes-graphics/mesa/mesa-gl-9.1.6/02_gbm_no_undefined.patch rename meta-opendreambox/recipes-graphics/mesa/{mesa-gl_9.1.6.bbappend => mesa-gl_%.bbappend} (50%) diff --git a/meta-opendreambox/recipes-graphics/mesa/mesa-gl-9.1.6/01_gbm_egl.patch b/meta-opendreambox/recipes-graphics/mesa/mesa-gl-9.1.6/01_gbm_egl.patch deleted file mode 100644 index 4769c99e..00000000 --- a/meta-opendreambox/recipes-graphics/mesa/mesa-gl-9.1.6/01_gbm_egl.patch +++ /dev/null @@ -1,23 +0,0 @@ -Source: git://git.debian.org/git/pkg-xorg/lib/mesa -commit f18181516aef48395304122a804b4f7d036cb73f -Author: Julien Cristau -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/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/meta-opendreambox/recipes-graphics/mesa/mesa-gl-9.1.6/02_gbm_no_undefined.patch b/meta-opendreambox/recipes-graphics/mesa/mesa-gl-9.1.6/02_gbm_no_undefined.patch deleted file mode 100644 index 66664758..00000000 --- a/meta-opendreambox/recipes-graphics/mesa/mesa-gl-9.1.6/02_gbm_no_undefined.patch +++ /dev/null @@ -1,29 +0,0 @@ -Source: git://git.debian.org/git/pkg-xorg/lib/mesa -commit 012d959a18d229601de040d8d557572330809eb9 -Author: Julien Cristau -Date: Tue Jun 25 21:33:41 2013 +0200 - - Make sure libgbm doesn't have undefined symbols. - -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/meta-opendreambox/recipes-graphics/mesa/mesa-gl_9.1.6.bbappend b/meta-opendreambox/recipes-graphics/mesa/mesa-gl_%.bbappend similarity index 50% rename from meta-opendreambox/recipes-graphics/mesa/mesa-gl_9.1.6.bbappend rename to meta-opendreambox/recipes-graphics/mesa/mesa-gl_%.bbappend index d190416b..2cbc72d1 100644 --- a/meta-opendreambox/recipes-graphics/mesa/mesa-gl_9.1.6.bbappend +++ b/meta-opendreambox/recipes-graphics/mesa/mesa-gl_%.bbappend @@ -1,16 +1,6 @@ -SRC_URI += "file://01_gbm_egl.patch \ - file://02_gbm_no_undefined.patch" - -FILESEXTRAPATHS_prepend := "${THISDIR}/${P}:" - PACKAGECONFIG = "dri \ ${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \ ${@base_contains('DISTRO_FEATURES', 'wayland', 'egl wayland', '', d)} \ " EGL_PLATFORMS = "${@base_contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)}" - -do_configure_prepend() { - # Don't build or install libEGL. - sed -e 's,\,,' -i ${S}/src/egl/Makefile.am -} -- 2.20.1