Revert "Added 'tizen-remote-surface' protocol"

This reverts commit f5cd3f30658a1b66325e54e76d143fe00ddaa07b.

Change-Id: Ie1703697a27a98b5703aa6ffabdab69ad2b9edb1

diff --git a/Makefile.am b/Makefile.am
index d23ca26..241a644 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,7 +5,5 @@ SUBDIRS = src tool
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = \
        wayland-tbm-server.pc \
-       wayland-tbm-client.pc \
-       tizen-remote-surface-server.pc \
-       tizen-remote-surface-client.pc
+       wayland-tbm-client.pc
 

diff --git a/configure.ac b/configure.ac
index 54020ab..e34de7a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -25,9 +25,7 @@ AC_CONFIG_FILES([
     src/Makefile
     test/Makefile
     tool/Makefile
-    wayland-tbm-server.pc
-    wayland-tbm-client.pc
-    tizen-remote-surface-server.pc
-    tizen-remote-surface-client.pc
+       wayland-tbm-server.pc
+       wayland-tbm-client.pc
 ])
 AC_OUTPUT

diff --git a/packaging/libwayland-tbm.spec b/packaging/libwayland-tbm.spec
index 43420d5..bd1f212 100644 (file)
--- a/packaging/libwayland-tbm.spec
+++ b/packaging/libwayland-tbm.spec
@@ -75,14 +75,12 @@ cp -af COPYING %{buildroot}/%{TZ_SYS_RO_SHARE}/license/%{name}
 %manifest %{name}.manifest
 %{TZ_SYS_RO_SHARE}/license/%{name}
 %_libdir/libwayland-tbm-server.so.0*
-%_libdir/libtizen-remote-surface-server.so.0*
 
 %files -n libwayland-tbm-client
 %defattr(-,root,root)
 %manifest %{name}.manifest
 %{TZ_SYS_RO_SHARE}/license/%{name}
 %_libdir/libwayland-tbm-client.so.0*
-%_libdir/libtizen-remote-surface-client.so.0*
 %{_bindir}/wayland-tbm-monitor
 
 %files devel
@@ -91,9 +89,6 @@ cp -af COPYING %{buildroot}/%{TZ_SYS_RO_SHARE}/license/%{name}
 %_includedir/wayland-tbm*.h
 %_libdir/libwayland-tbm*.so
 %_libdir/pkgconfig/wayland-tbm*.pc
-%_includedir/tizen-remote-surface*.h
-%_libdir/*tizen-remote-surface*.so
-%_libdir/pkgconfig/tizen-remote-surface*.pc
 %doc README TODO
 
 %changelog

diff --git a/protocol/tizen-remote-surface.xml b/protocol/tizen-remote-surface.xml
deleted file mode 100644 (file)
index 20ad4a7..0000000
--- a/protocol/tizen-remote-surface.xml
+++ /dev/null
@@ -1,171 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<protocol name="tizen_remote_surface">
-  <interface name="tizen_remote_surface_manager" version="1">
-     <description summary="manager of tizen_remote_surface">
-        A manager of tizen_remote_surface. Thie object is in charge of
-        creating tizen_remote_surface_provider and tizen_remote_surface and
-        provide additional operations for those objects.
-     </description>
-     <request name="create_provider">
-        <description summary="create nea remote surface provider">
-           Ask manager to create a new remote surface provider.
-           A wl_surface is required for making remote surface provider.
-        </description>
-        <arg name="id" type="new_id" interface="tizen_remote_surface_provider" />
-        <arg name="surface" type="object" interface="wl_surface" />
-     </request>
-
-     <request name="create_surface">
-        <description summary="create new remote surface">
-           Ask manager to create a new remote surface.
-           resource_id is required to identify this remote surface is what provider of
-           and wl_tbm object is used to remote buffer for this remote surface.
-        </description>
-        <arg name="id" type="new_id" interface="tizen_remote_surface" />
-        <arg name="resource_id" type="uint" />
-       <arg name="tbm" type="object" interface="wl_tbm" />
-     </request>
-
-     <request name="bind_surface">
-        <description summary="bind a remote surface and a wl_surface">
-           Combining a remote surface object into a wl_surface object.
-        </description>
-        <arg name="surface" type="object" interface="wl_surface" />
-        <arg name="remote_surface" type="object" interface="tizen_remote_surface" />
-     </request>
-  </interface>
-
-  <interface name="tizen_remote_surface_provider" version="1">
-     <description summary="a provider of remote buffer source">
-        A provider client. Surfaces of providers are not included on compositing,
-        Instead of that its attached buffer is used for creating remote buffer
-        and the remote buffer is delivered to remote surfaces.
-     </description>
-     <request name="destroy" type="destructor" />
-
-     <!-- for id -->
-     <event name="resource_id">
-        <description summary="announce resource id of provider">
-           Announce resource id of this provider.
-        </description>
-        <arg name="resource_id" type="uint" />
-     </event>
-
-     <!-- for visibility -->
-     <event name="visibility">
-        <description summary="notify of visibility change">
-           Notify of visibility chages.
-           This provider's visibility is determined by its remote surfaces.
-        </description>
-        <arg name="visibility" type="uint" enum="visibility_type"/>
-     </event>
-
-     <enum name="visibility_type">
-        <entry name="visible" value="0" />
-        <entry name="invisible" value="1" />
-     </enum>
-  </interface>
-
-  <interface name="tizen_remote_surface" version="1">
-     <request name="destroy" type="destructor" />
-
-     <!-- for buffer update -->
-     <request name="redirect">
-        <description summary="request redirect of provider's buffer"/>
-     </request>
-     <request name="unredirect">
-        <description summary="request unredirect of provider's buffer"/>
-     </request>
-
-     <event name="update_buffer">
-        <description summary="deliver updated buffer of provider">
-           When selected provider of a remote surface sent wl_surface.commit,
-           server deliver a remote buffer is created using a buffer of the
-           provider.
-        </description>
-        <arg name="buffer" type="object" interface="wl_buffer" />
-        <arg name="time" type="uint" />
-     </event>
-
-     <!-- for event transference -->
-     <request name="transfer_mouse_event">
-        <arg name="event_type" type="uint" enum="event_type"/>
-        <arg name="device" type="int" />
-        <arg name="button" type="int" />
-        <arg name="x" type="int" />
-        <arg name="y" type="int" />
-        <arg name="radius_x" type="fixed" />
-        <arg name="radius_y" type="fixed" />
-        <arg name="pressure" type="fixed" />
-        <arg name="angle" type="fixed" />
-        <arg name="class" type="uint" />
-        <arg name="subclass" type="uint" />
-        <arg name="identifier" type="string" />
-        <arg name="time" type="uint" />
-     </request>
-
-     <request name="transfer_mouse_wheel">
-        <arg name="direction" type="uint" />
-        <arg name="z" type="int" />
-        <arg name="class" type="uint" />
-        <arg name="subclass" type="uint" />
-        <arg name="identifier" type="string" />
-        <arg name="time" type="uint" />
-     </request>
-
-     <request name="transfer_touch_event">
-        <arg name="event_type" type="uint" enum="event_type"/>
-        <arg name="device" type="int" />
-        <arg name="button" type="int" />
-        <arg name="x" type="int" />
-        <arg name="y" type="int" />
-        <arg name="radius_x" type="fixed" />
-        <arg name="radius_y" type="fixed" />
-        <arg name="pressure" type="fixed" />
-        <arg name="angle" type="fixed" />
-        <arg name="class" type="uint" />
-        <arg name="subclass" type="uint" />
-        <arg name="identifier" type="string" />
-        <arg name="time" type="uint" />
-     </request>
-
-     <request name="transfer_touch_cancel" />
-
-     <request name="transfer_key_event">
-        <arg name="event_type" type="uint" enum="event_type"/>
-        <arg name="keycode" type="int" />
-        <arg name="class" type="uint" />
-        <arg name="subclass" type="uint" />
-        <arg name="identifier" type="string" />
-        <arg name="time" type="uint" />
-     </request>
-
-     <enum name="event_type">
-        <entry name="none" value="0" />
-        <entry name="mouse_down" value="1" />
-        <entry name="mouse_up" value="2" />
-        <entry name="mouse_move" value="3" />
-        <entry name="touch_down" value="4" />
-        <entry name="touch_up" value="5" />
-        <entry name="touch_move" value="6" />
-        <entry name="key_down" value="7" />
-        <entry name="key_up" value="8" />
-     </enum>
-
-     <!-- for visibility transference -->
-     <request name="transfer_visibility">
-        <description summary="notify of visibility change of remote surface" />
-        <arg name="visibility" type="uint" enum="visibility_type" />
-     </request>
-
-     <enum name="visibility_type">
-        <entry name="visible" value="0" />
-        <entry name="invisible" value="1" />
-     </enum>
-
-     <!-- for notify of provider's ejection -->
-     <event name="missing">
-        <description summary="notify of leave of provider" />
-     </event>
-  </interface>
-</protocol>

diff --git a/src/Makefile.am b/src/Makefile.am
index 710d66b..d32ac41 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -57,20 +57,6 @@ nodist_libwayland_tbm_client_la_SOURCES =            \
 %-client-protocol.h : $(top_srcdir)/protocol/%.xml
        $(AM_V_GEN)$(MKDIR_P) $(dir $@) && $(wayland_scanner) client-header < $< > $@
 
-### tizen-remote-surface
-lib_LTLIBRARIES += \
-    libtizen-remote-surface-server.la \
-    libtizen-remote-surface-client.la
-include_HEADERS += \
-    tizen-remote-surface-server-protocol.h \
-    tizen-remote-surface-client-protocol.h
-libtizen_remote_surface_server_la_SOURCES = tizen-remote-surface-protocol.c
-libtizen_remote_surface_server_la_CFLAGS  = @WL_TBM_SERVER_CFLAGS@
-libtizen_remote_surface_server_la_LIBADD  = @WL_TBM_SERVER_LIBS@
-libtizen_remote_surface_client_la_SOURCES = tizen-remote-surface-protocol.c
-libtizen_remote_surface_client_la_CFLAGS  = @WL_TBM_CLIENT_CFLAGS@
-libtizen_remote_surface_client_la_LIBADD  = @WL_TBM_CLIENT_LIBS@
-
 BUILT_SOURCES = \
        $(nodist_libwayland_tbm_server_la_SOURCES)      \
        $(nodist_libwayland_tbm_client_la_SOURCES)

diff --git a/tizen-remote-surface-client.pc.in b/tizen-remote-surface-client.pc.in
deleted file mode 100644 (file)
index 7ed8a07..0000000
--- a/tizen-remote-surface-client.pc.in
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
-
-Name: tizen-remote-surface
-Description: Remote Surface Protocol for TIZEN
-Version: 1.0.0
-Requires: wayland-client wayland-tbm-client
-Libs: -L${libdir} -ltizen-remote-surface-client
-Cflags: -I${includedir}

diff --git a/tizen-remote-surface-server.pc.in b/tizen-remote-surface-server.pc.in
deleted file mode 100644 (file)
index dcc302c..0000000
--- a/tizen-remote-surface-server.pc.in
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
-
-Name: tizen-remote-surface
-Description: Remote Surface Protocol for TIZEN
-Version: 1.0.0
-Requires: wayland-server wayland-tbm-server
-Libs: -L${libdir} -ltizen-remote-surface-server
-Cflags: -I${includedir}