Revert "e_comp_screen: create ds_gbm_server for supporting client gbm buffer"

This reverts commit 86656ee2752c76c48d20cad615cb501d34656b99.

Change-Id: I36409b513c3a902c1302ae291d8cb9ac6410a413

diff --git a/configure.ac b/configure.ac
index 2037066..943840f 100755 (executable)
--- a/configure.ac
+++ b/configure.ac
@@ -291,7 +291,6 @@ e_requires="\
   libds \
   libds-tizen-tbm-server \
   libds-tizen-scaler \
-  libds-tizen-gbm-server \
   "
 
 PKG_CHECK_MODULES(E_INFO, [

diff --git a/packaging/enlightenment.spec b/packaging/enlightenment.spec
index 3ea266e..1605872 100644 (file)
--- a/packaging/enlightenment.spec
+++ b/packaging/enlightenment.spec
@@ -81,7 +81,6 @@ BuildRequires:  pkgconfig(capi-media-streamrecorder)
 BuildRequires:  pkgconfig(libds)
 BuildRequires:  pkgconfig(libds-tizen-tbm-server)
 BuildRequires:  pkgconfig(libds-tizen-scaler)
-BuildRequires:  pkgconfig(libds-tizen-gbm-server)
 
 %if "%{LIBGOMP}" == "use"
 Requires:       libgomp

diff --git a/src/bin/e_comp_screen.c b/src/bin/e_comp_screen.c
index 9c8bb22..7affba2 100644 (file)
--- a/src/bin/e_comp_screen.c
+++ b/src/bin/e_comp_screen.c
@@ -4,7 +4,6 @@
 #include <device/board-internal.h>
 #include <tbm_drm_helper.h>
 #include <gbm.h>
-#include <libds-tizen/types/gbm_server.h>
 
 #define PATH "/org/enlightenment/wm"
 #define IFACE "org.enlightenment.wm.screen_rotation"
@@ -550,7 +549,7 @@ _e_comp_screen_del(E_Comp_Screen *e_comp_screen)
           }
      }
 
-   if (e_comp_screen->gbm_server) ds_gbm_server_destroy(e_comp_screen->gbm_server);
+   if (e_comp_screen->gdevice) gbm_device_destroy(e_comp_screen->gdevice);
    if (e_comp_screen->gdevice_fd >= 0) close(e_comp_screen->gdevice_fd);
    if (e_comp_screen->bufmgr) tbm_bufmgr_deinit(e_comp_screen->bufmgr);
    if (e_comp_screen->fd >= 0) close(e_comp_screen->fd);
@@ -1775,15 +1774,14 @@ e_comp_screen_gbm_device_get(E_Comp_Screen *e_comp_screen)
    fd = tbm_drm_helper_get_master_fd();
    EINA_SAFETY_ON_FALSE_RETURN_VAL(fd >= 0, NULL);
 
-   e_comp_screen->gbm_server = ds_gbm_server_create(fd);
-   if (!e_comp_screen->gbm_server)
+   e_comp_screen->gdevice = gbm_create_device(fd);
+   if (!e_comp_screen->gdevice)
      {
-        ERR("fail to create gbm server");
+        ERR("fail to create gbm device");
         close(fd);
         return NULL;
      }
 
-   e_comp_screen->gdevice = e_comp_screen->gbm_server->gbm_device;
    e_comp_screen->gdevice_fd = fd;
 
    return e_comp_screen->gdevice;

diff --git a/src/bin/e_comp_screen.h b/src/bin/e_comp_screen.h
index 47eaebb..c818926 100644 (file)
--- a/src/bin/e_comp_screen.h
+++ b/src/bin/e_comp_screen.h
@@ -5,7 +5,6 @@
 #define E_COMP_SCREEN_H
 
 #include <tdm.h>
-#include <libds-tizen/gbm_server.h>
 
 typedef struct _E_Comp_Screen   E_Comp_Screen;
 typedef struct _E_Screen        E_Screen;
@@ -21,10 +20,8 @@ struct _E_Comp_Screen
    int            num_outputs;
    tdm_display   *tdisplay;
    tbm_bufmgr     bufmgr;
-
-   struct ds_gbm_server *gbm_server;
-   void *gdevice;
-   int gdevice_fd;
+   void          *gdevice;
+   int            gdevice_fd;
 
    /* for sw compositing */
    const Eina_List *devices;