gbm: Removed the build dependency with libgbm.

 - Removed the tpl_gbm backend from the build.
 - but did not delete the source file yet.

Change-Id: Ie812a4f92a234b210955ddade0a958c6e51499be
Signed-off-by: Joonbum Ko <joonbum.ko@samsung.com>

diff --git a/configure.ac b/configure.ac
index fbdb729..07b3094 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -60,7 +60,7 @@ AC_ARG_WITH([wayland],
    [with_wayland=yes])
 
 AS_IF([test "${with_wayland}" = "yes" || test "${with_wayland}" = "1"],
-         [PKG_CHECK_MODULES([TPL_WL], [gbm libtdm-client wayland-tbm-client wayland-tbm-server tizen-surface-client glib-2.0])
+         [PKG_CHECK_MODULES([TPL_WL], [libtdm-client wayland-tbm-client wayland-tbm-server tizen-surface-client glib-2.0])
           TPL_CFLAGS+="$TPL_WL_CFLAGS"
           TPL_CFLAGS+=" -DTPL_WINSYS_WL=1 "
           TPL_LIBS+="$TPL_WL_LIBS"],

diff --git a/packaging/libtpl-egl.spec b/packaging/libtpl-egl.spec
index 1a9d1b2..3a1b38e 100644 (file)
--- a/packaging/libtpl-egl.spec
+++ b/packaging/libtpl-egl.spec
@@ -78,7 +78,6 @@ BuildRequires:        pkgconfig(libdrm)
 %if "%{TPL_WINSYS}" == "WL"
 BuildRequires:  libtool
 BuildRequires:  wayland-devel
-BuildRequires: pkgconfig(gbm)
 BuildRequires: pkgconfig(libtdm-client)
 BuildRequires: pkgconfig(wayland-tbm-client)
 BuildRequires:  pkgconfig(wayland-tbm-server)

diff --git a/src/tpl.c b/src/tpl.c
index 7c834ce..2a19d8d 100644 (file)
--- a/src/tpl.c
+++ b/src/tpl.c
@@ -261,8 +261,6 @@ __tpl_display_choose_backend(tpl_handle_t native_dpy)
 #ifdef TPL_WINSYS_WL
        if (__tpl_display_choose_backend_tbm(native_dpy) == TPL_TRUE)
                return TPL_BACKEND_TBM;
-       if (__tpl_display_choose_backend_gbm(native_dpy) == TPL_TRUE)
-               return TPL_BACKEND_GBM;
        if (wl_egl_thread) {
                if (__tpl_display_choose_backend_wl_egl_thread(native_dpy))
                        return TPL_BACKEND_WAYLAND_THREAD;
@@ -292,9 +290,6 @@ __tpl_display_init_backend(tpl_display_t *display, tpl_backend_type_t type)
 
        switch (type) {
 #ifdef TPL_WINSYS_WL
-       case TPL_BACKEND_GBM:
-               __tpl_display_init_backend_gbm(&display->backend);
-               break;
        case TPL_BACKEND_WAYLAND:
                __tpl_display_init_backend_wayland_egl(&display->backend);
                break;
@@ -434,9 +429,6 @@ __tpl_surface_init_backend(tpl_surface_t *surface, tpl_backend_type_t type)
 
        switch (type) {
 #ifdef TPL_WINSYS_WL
-       case TPL_BACKEND_GBM:
-               __tpl_surface_init_backend_gbm(&surface->backend);
-               break;
        case TPL_BACKEND_WAYLAND:
                __tpl_surface_init_backend_wayland_egl(&surface->backend);
                break;

diff --git a/src/tpl_internal.h b/src/tpl_internal.h
index 4d1d45d..6dff22f 100644 (file)
--- a/src/tpl_internal.h
+++ b/src/tpl_internal.h
@@ -213,7 +213,6 @@ void __tpl_runtime_remove_surface(tpl_surface_t *surface);
 
 /* Backend initialization functions. */
 tpl_backend_type_t __tpl_display_choose_backend(tpl_handle_t native_dpy);
-tpl_bool_t __tpl_display_choose_backend_gbm(tpl_handle_t native_dpy);
 tpl_bool_t __tpl_display_choose_backend_tbm(tpl_handle_t native_dpy);
 tpl_bool_t __tpl_display_choose_backend_wayland_egl(tpl_handle_t native_dpy);
 tpl_bool_t __tpl_display_choose_backend_wl_egl_thread(tpl_handle_t native_dpy);
@@ -224,7 +223,6 @@ void __tpl_display_init_backend(tpl_display_t *display,
                                                                tpl_backend_type_t type);
 void __tpl_surface_init_backend(tpl_surface_t *surface,
                                                                tpl_backend_type_t type);
-void __tpl_display_init_backend_gbm(tpl_display_backend_t *backend);
 void __tpl_display_init_backend_tbm(tpl_display_backend_t *backend,
                                                                        tpl_backend_type_t type);
 void __tpl_display_init_backend_wayland_egl(tpl_display_backend_t *backend);
@@ -233,7 +231,6 @@ void __tpl_display_init_backend_wayland_vk_wsi(tpl_display_backend_t *backend);
 void __tpl_display_init_backend_wl_vk_wsi_thread(tpl_display_backend_t *backend);
 void __tpl_display_init_backend_x11_dri2(tpl_display_backend_t *backend);
 void __tpl_display_init_backend_x11_dri3(tpl_display_backend_t *backend);
-void __tpl_surface_init_backend_gbm(tpl_surface_backend_t *backend);
 void __tpl_surface_init_backend_tbm(tpl_surface_backend_t *backend,
                                                                        tpl_backend_type_t type);
 void __tpl_surface_init_backend_wayland_egl(tpl_surface_backend_t *backend);