tizen-surface: renew tizen-surface protocol path

Change-Id: I9ade77bd8fbe98d2949f527a6c2c00f05588ccce

diff --git a/configure.ac b/configure.ac
index c9f19c8..e400352 100755 (executable)
--- a/configure.ac
+++ b/configure.ac
@@ -3141,7 +3141,7 @@ EFL_INTERNAL_DEPEND_PKG([ECORE_WAYLAND], [eo])
 EFL_INTERNAL_DEPEND_PKG([ECORE_WAYLAND], [eina])
 
 EFL_DEPEND_PKG([ECORE_WAYLAND], [WAYLAND],
-   [wayland-client >= 1.3.0 wayland-cursor >= 1.3.0 xkbcommon >= 0.3.0 xdg-shell-client text-client tizen-extension-client wayland-tbm-client libtdm-client])
+   [wayland-client >= 1.3.0 wayland-cursor >= 1.3.0 xkbcommon >= 0.3.0 xdg-shell-client text-client tizen-extension-client tizen-surface-client wayland-tbm-client libtdm-client])
 
 EFL_EVAL_PKGS([ECORE_WAYLAND])
 

diff --git a/packaging/efl.spec b/packaging/efl.spec
index 9cf168d..d0d1323 100644 (file)
--- a/packaging/efl.spec
+++ b/packaging/efl.spec
@@ -28,6 +28,7 @@ BuildRequires:  pkgconfig(xdg-shell-client)
 BuildRequires:  pkgconfig(wayland-tbm-client)
 BuildRequires:  pkgconfig(wayland-tbm-server)
 BuildRequires:  pkgconfig(tizen-extension-client)
+BuildRequires:  pkgconfig(tizen-surface-client)
 BuildRequires:  pkgconfig(tizen-remote-surface-client)
 Requires:       libwayland-extension-client
 %endif

diff --git a/src/Makefile_Evas.am b/src/Makefile_Evas.am
index 3e03a29..16edaa9 100644 (file)
--- a/src/Makefile_Evas.am
+++ b/src/Makefile_Evas.am
@@ -1185,8 +1185,7 @@ modules/evas/engines/wayland_shm/evas_engine.c \
 modules/evas/engines/wayland_shm/evas_engine.h \
 modules/evas/engines/wayland_shm/evas_shm.c \
 modules/evas/engines/wayland_shm/evas_tbmbuf.c \
-modules/evas/engines/wayland_shm/evas_outbuf.c \
-modules/evas/engines/wayland_shm/tizen-surface-protocol.c
+modules/evas/engines/wayland_shm/evas_outbuf.c
 if EVAS_STATIC_BUILD_WAYLAND_SHM
 lib_evas_libevas_la_SOURCES += $(WAYLAND_SHM_SOURCES)
 lib_evas_libevas_la_CPPFLAGS += @evas_engine_wayland_shm_cflags@

diff --git a/src/modules/evas/engines/wayland_shm/evas_shm.c b/src/modules/evas/engines/wayland_shm/evas_shm.c
index abc4d57..b5018d0 100755 (executable)
--- a/src/modules/evas/engines/wayland_shm/evas_shm.c
+++ b/src/modules/evas/engines/wayland_shm/evas_shm.c
@@ -3,7 +3,7 @@
 #include "evas_engine.h"
 #include <sys/mman.h>
 
-#include "tizen-surface-client.h"
+#include <wayland-extension/tizen-surface-client-protocol.h>
 
 typedef struct _Shm_Pool Shm_Pool;
 struct _Shm_Pool

diff --git a/src/modules/evas/engines/wayland_shm/evas_tbmbuf.c b/src/modules/evas/engines/wayland_shm/evas_tbmbuf.c
index a931fc9..d620697 100644 (file)
--- a/src/modules/evas/engines/wayland_shm/evas_tbmbuf.c
+++ b/src/modules/evas/engines/wayland_shm/evas_tbmbuf.c
@@ -8,7 +8,7 @@
 #include <dlfcn.h>
 #include <wayland-client.h>
 
-#include "tizen-surface-client.h"
+#include <wayland-extension/tizen-surface-client-protocol.h>
 
 #define KEY_WINDOW (unsigned long)(&key_window)
 #define KEY_WL_BUFFER (unsigned long)(&key_wl_buffer)

diff --git a/src/modules/evas/engines/wayland_shm/tizen-surface-client.h b/src/modules/evas/engines/wayland_shm/tizen-surface-client.h
deleted file mode 100644 (file)
index 6eaa459..0000000
--- a/src/modules/evas/engines/wayland_shm/tizen-surface-client.h
+++ /dev/null
@@ -1,118 +0,0 @@
-#ifndef TIZEN_SURFACE_CLIENT_PROTOCOL_H
-#define TIZEN_SURFACE_CLIENT_PROTOCOL_H
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-#include <stdint.h>
-#include <stddef.h>
-#include "wayland-client.h"
-
-struct wl_client;
-struct wl_resource;
-
-struct tizen_surface_shm;
-struct tizen_surface_shm_flusher;
-struct wl_surface;
-
-extern const struct wl_interface tizen_surface_shm_interface;
-extern const struct wl_interface tizen_surface_shm_flusher_interface;
-
-#define TIZEN_SURFACE_SHM_GET_FLUSHER  0
-
-#define TIZEN_SURFACE_SHM_GET_FLUSHER_SINCE_VERSION    1
-
-static inline void
-tizen_surface_shm_set_user_data(struct tizen_surface_shm *tizen_surface_shm, void *user_data)
-{
-       wl_proxy_set_user_data((struct wl_proxy *) tizen_surface_shm, user_data);
-}
-
-static inline void *
-tizen_surface_shm_get_user_data(struct tizen_surface_shm *tizen_surface_shm)
-{
-       return wl_proxy_get_user_data((struct wl_proxy *) tizen_surface_shm);
-}
-
-static inline uint32_t
-tizen_surface_shm_get_version(struct tizen_surface_shm *tizen_surface_shm)
-{
-       return wl_proxy_get_version((struct wl_proxy *) tizen_surface_shm);
-}
-
-static inline void
-tizen_surface_shm_destroy(struct tizen_surface_shm *tizen_surface_shm)
-{
-       wl_proxy_destroy((struct wl_proxy *) tizen_surface_shm);
-}
-
-static inline struct tizen_surface_shm_flusher *
-tizen_surface_shm_get_flusher(struct tizen_surface_shm *tizen_surface_shm, struct wl_surface *surface)
-{
-       struct wl_proxy *id;
-
-       id = wl_proxy_marshal_constructor((struct wl_proxy *) tizen_surface_shm,
-                        TIZEN_SURFACE_SHM_GET_FLUSHER, &tizen_surface_shm_flusher_interface, NULL, surface);
-
-       return (struct tizen_surface_shm_flusher *) id;
-}
-
-struct tizen_surface_shm_flusher_listener {
-       /**
-        * flush - (none)
-        */
-       void (*flush)(void *data,
-                     struct tizen_surface_shm_flusher *tizen_surface_shm_flusher);
-       /**
-        * free_flush - (none)
-        * @since: 2
-        */
-       void (*free_flush)(void *data,
-                          struct tizen_surface_shm_flusher *tizen_surface_shm_flusher);
-};
-
-static inline int
-tizen_surface_shm_flusher_add_listener(struct tizen_surface_shm_flusher *tizen_surface_shm_flusher,
-                                      const struct tizen_surface_shm_flusher_listener *listener, void *data)
-{
-       return wl_proxy_add_listener((struct wl_proxy *) tizen_surface_shm_flusher,
-                                    (void (**)(void)) listener, data);
-}
-
-#define TIZEN_SURFACE_SHM_FLUSHER_DESTROY      0
-
-#define TIZEN_SURFACE_SHM_FLUSHER_DESTROY_SINCE_VERSION        1
-
-static inline void
-tizen_surface_shm_flusher_set_user_data(struct tizen_surface_shm_flusher *tizen_surface_shm_flusher, void *user_data)
-{
-       wl_proxy_set_user_data((struct wl_proxy *) tizen_surface_shm_flusher, user_data);
-}
-
-static inline void *
-tizen_surface_shm_flusher_get_user_data(struct tizen_surface_shm_flusher *tizen_surface_shm_flusher)
-{
-       return wl_proxy_get_user_data((struct wl_proxy *) tizen_surface_shm_flusher);
-}
-
-static inline uint32_t
-tizen_surface_shm_flusher_get_version(struct tizen_surface_shm_flusher *tizen_surface_shm_flusher)
-{
-       return wl_proxy_get_version((struct wl_proxy *) tizen_surface_shm_flusher);
-}
-
-static inline void
-tizen_surface_shm_flusher_destroy(struct tizen_surface_shm_flusher *tizen_surface_shm_flusher)
-{
-       wl_proxy_marshal((struct wl_proxy *) tizen_surface_shm_flusher,
-                        TIZEN_SURFACE_SHM_FLUSHER_DESTROY);
-
-       wl_proxy_destroy((struct wl_proxy *) tizen_surface_shm_flusher);
-}
-
-#ifdef  __cplusplus
-}
-#endif
-
-#endif

diff --git a/src/modules/evas/engines/wayland_shm/tizen-surface-protocol.c b/src/modules/evas/engines/wayland_shm/tizen-surface-protocol.c
deleted file mode 100644 (file)
index bd5e8a6..0000000
--- a/src/modules/evas/engines/wayland_shm/tizen-surface-protocol.c
+++ /dev/null
@@ -1,37 +0,0 @@
-#include <stdlib.h>
-#include <stdint.h>
-#include "wayland-util.h"
-
-extern const struct wl_interface tizen_surface_shm_flusher_interface;
-extern const struct wl_interface wl_surface_interface;
-
-static const struct wl_interface *types[] = {
-       &tizen_surface_shm_flusher_interface,
-       &wl_surface_interface,
-};
-
-static const struct wl_message tizen_surface_shm_requests[] = {
-       { "get_flusher", "no", types + 0 },
-};
-
-WL_EXPORT const struct wl_interface tizen_surface_shm_interface = {
-       "tizen_surface_shm", 2,
-       1, tizen_surface_shm_requests,
-       0, NULL,
-};
-
-static const struct wl_message tizen_surface_shm_flusher_requests[] = {
-       { "destroy", "", types + 0 },
-};
-
-static const struct wl_message tizen_surface_shm_flusher_events[] = {
-       { "flush", "", types + 0 },
-       { "free_flush", "2", types + 0 },
-};
-
-WL_EXPORT const struct wl_interface tizen_surface_shm_flusher_interface = {
-       "tizen_surface_shm_flusher", 2,
-       1, tizen_surface_shm_flusher_requests,
-       2, tizen_surface_shm_flusher_events,
-};
-