[SDL_Tizen] Delete LGPL files 36/127036/1 accepted/tizen/unified/20170426.061826 submit/tizen/20170426.022238 submit/tizen/20170426.022443
authorhuiyu.eun <huiyu.eun@samsung.com>
Wed, 26 Apr 2017 02:01:30 +0000 (11:01 +0900)
committerhuiyu.eun <huiyu.eun@samsung.com>
Wed, 26 Apr 2017 02:18:33 +0000 (11:18 +0900)
- Fix warnings
- Delete LGPL files

Change-Id: I39e0f8f13e67b60eb38c1dff04e84a83fb8ee361
Signed-off-by: huiyu.eun <huiyu.eun@samsung.com>
src/video/tizen/SDL_tizenopengles.c
src/video/tizen/SDL_tizenwindow.c
src/video/wayland/ivi-application-client-protocol.h [deleted file]
src/video/wayland/ivi-application-protocol.c [deleted file]
src/video/wayland/subsurface-client-protocol.h [deleted file]
src/video/wayland/subsurface-protocol.c [deleted file]

index 779731d..e60be60 100755 (executable)
@@ -105,7 +105,7 @@ Tizen_GLES_GetAlphaSize(_THIS)
     if (!_this->egl_data) {
         /* The EGL library wasn't loaded, SDL_GetError() should have info */
         SDL_Log("egl_data is NULL");
-        return NULL;
+        return 0;
     }
 
     if (_this->egl_data->eglGetConfigAttrib(_this->egl_data->egl_display,
index cdb46f6..f00d371 100755 (executable)
@@ -35,6 +35,7 @@
 #include "SDL_tizenevents_c.h"
 
 #include "SDL_tizenwindow.h"
+#include "SDL_tizenopengles.h"
 
 #include "../../events/SDL_mouse_c.h"
 #include "../../joystick/tizen/SDL_sysjoystick_c.h"
@@ -332,7 +333,7 @@ Tizen_CreateWindow(_THIS, SDL_Window *window)
         }
 
         if (!Tizen_GLES_GetAlphaSize(_this)) {
-           ecore_wl_window_opaque_region_set(wind->window, window->x, window->y, window->w, window->h);
+            ecore_wl_window_opaque_region_set(wind->window, window->x, window->y, window->w, window->h);
         }
         else {
             wl_surface_set_opaque_region(ecore_wl_window_surface_get(wind->window), NULL);
diff --git a/src/video/wayland/ivi-application-client-protocol.h b/src/video/wayland/ivi-application-client-protocol.h
deleted file mode 100644 (file)
index 84fecd8..0000000
+++ /dev/null
@@ -1,176 +0,0 @@
-/*
- * Copyright (C) 2013 DENSO CORPORATION
- * Copyright (c) 2013 BMW Car IT GmbH
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-#ifndef IVI_APPLICATION_CLIENT_PROTOCOL_H
-#define IVI_APPLICATION_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 ivi_surface;
-struct ivi_application;
-
-extern const struct wl_interface ivi_surface_interface;
-extern const struct wl_interface ivi_application_interface;
-
-#ifndef IVI_SURFACE_WARNING_CODE_ENUM
-#define IVI_SURFACE_WARNING_CODE_ENUM
-/**
- * ivi_surface_warning_code - possible warning codes returned by ivi
- *      compositor
- * @IVI_SURFACE_WARNING_CODE_INVALID_WL_SURFACE: wl_surface is invalid
- * @IVI_SURFACE_WARNING_CODE_IVI_ID_IN_USE: ivi_id is in use and can not
- *      be shared
- *
- * These define all possible warning codes returned by ivi compositor on
- * server-side warnings. invalid_wl_surface: - wl_surface already has a
- * another role. - wl_surface is destroyed before the ivi_surface is
- * destroyed. ivi_id_in_use: ivi_id is already assigned by another
- * application.
- */
-enum ivi_surface_warning_code {
-        IVI_SURFACE_WARNING_CODE_INVALID_WL_SURFACE = 1,
-        IVI_SURFACE_WARNING_CODE_IVI_ID_IN_USE = 2,
-};
-#endif /* IVI_SURFACE_WARNING_CODE_ENUM */
-
-/**
- * ivi_surface - application interface to surface in ivi compositor
- * @visibility: visibility of surface in ivi compositor has changed
- * @warning: server-side warning detected
- *
- *
- */
-struct ivi_surface_listener {
-        /**
-         * visibility - visibility of surface in ivi compositor has
-         *      changed
-         * @visibility: (none)
-         *
-         * The new visibility state is provided in argument visibility.
-         * If visibility is 0, the surface has become invisible. If
-         * visibility is not 0, the surface has become visible.
-         */
-        void (*visibility)(void *data,
-                           struct ivi_surface *ivi_surface,
-                           int32_t visibility);
-        /**
-         * warning - server-side warning detected
-         * @warning_code: (none)
-         * @warning_text: (none)
-         *
-         * The ivi compositor encountered warning while processing a
-         * request by this application. The warning is defined by argument
-         * warning_code and optional warning_text. If the warning is
-         * detected, client shall destroy the ivi_surface object.
-         *
-         * When a warning event is sent, the compositor turns the
-         * ivi_surface object inert. The ivi_surface will not deliver
-         * further events, all requests on it are ignored except 'destroy',
-         * and the association to the ivi_id is removed. The client should
-         * destroy the ivi_surface object. If an inert ivi_surface object
-         * is used as an argument to any other object's request, that
-         * request will [produce a fatal error / produce a warning / be
-         * ignored].
-         */
-        void (*warning)(void *data,
-                        struct ivi_surface *ivi_surface,
-                        int32_t warning_code,
-                        const char *warning_text);
-};
-
-static inline int
-ivi_surface_add_listener(struct ivi_surface *ivi_surface,
-                         const struct ivi_surface_listener *listener, void *data)
-{
-        return wl_proxy_add_listener((struct wl_proxy *) ivi_surface,
-                                     (void (**)(void)) listener, data);
-}
-
-#define IVI_SURFACE_DESTROY     0
-
-static inline void
-ivi_surface_set_user_data(struct ivi_surface *ivi_surface, void *user_data)
-{
-        wl_proxy_set_user_data((struct wl_proxy *) ivi_surface, user_data);
-}
-
-static inline void *
-ivi_surface_get_user_data(struct ivi_surface *ivi_surface)
-{
-        return wl_proxy_get_user_data((struct wl_proxy *) ivi_surface);
-}
-
-static inline void
-ivi_surface_destroy(struct ivi_surface *ivi_surface)
-{
-        wl_proxy_marshal((struct wl_proxy *) ivi_surface,
-                         IVI_SURFACE_DESTROY);
-
-        wl_proxy_destroy((struct wl_proxy *) ivi_surface);
-}
-
-#define IVI_APPLICATION_SURFACE_CREATE  0
-
-static inline void
-ivi_application_set_user_data(struct ivi_application *ivi_application, void *user_data)
-{
-        wl_proxy_set_user_data((struct wl_proxy *) ivi_application, user_data);
-}
-
-static inline void *
-ivi_application_get_user_data(struct ivi_application *ivi_application)
-{
-        return wl_proxy_get_user_data((struct wl_proxy *) ivi_application);
-}
-
-static inline void
-ivi_application_destroy(struct ivi_application *ivi_application)
-{
-        wl_proxy_destroy((struct wl_proxy *) ivi_application);
-}
-
-static inline struct ivi_surface *
-ivi_application_surface_create(struct ivi_application *ivi_application, uint32_t ivi_id, struct wl_surface *surface)
-{
-        struct wl_proxy *id;
-
-        id = wl_proxy_marshal_constructor((struct wl_proxy *) ivi_application,
-                         IVI_APPLICATION_SURFACE_CREATE, &ivi_surface_interface, ivi_id, surface, NULL);
-
-        return (struct ivi_surface *) id;
-}
-
-#ifdef  __cplusplus
-}
-#endif
-
-#endif
diff --git a/src/video/wayland/ivi-application-protocol.c b/src/video/wayland/ivi-application-protocol.c
deleted file mode 100644 (file)
index 57a951f..0000000
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright (C) 2013 DENSO CORPORATION
- * Copyright (c) 2013 BMW Car IT GmbH
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-#include <stdlib.h>
-#include <stdint.h>
-#include "wayland-util.h"
-
-extern const struct wl_interface ivi_surface_interface;
-extern const struct wl_interface wl_surface_interface;
-
-static const struct wl_interface *types[] = {
-        NULL,
-        NULL,
-        NULL,
-        &wl_surface_interface,
-        &ivi_surface_interface,
-};
-
-static const struct wl_message ivi_surface_requests[] = {
-        { "destroy", "", types + 0 },
-};
-
-static const struct wl_message ivi_surface_events[] = {
-        { "visibility", "i", types + 0 },
-        { "warning", "i?s", types + 0 },
-};
-
-WL_EXPORT const struct wl_interface ivi_surface_interface = {
-        "ivi_surface", 1,
-        1, ivi_surface_requests,
-        2, ivi_surface_events,
-};
-
-static const struct wl_message ivi_application_requests[] = {
-        { "surface_create", "uon", types + 2 },
-};
-
-WL_EXPORT const struct wl_interface ivi_application_interface = {
-        "ivi_application", 1,
-        1, ivi_application_requests,
-        0, NULL,
-};
diff --git a/src/video/wayland/subsurface-client-protocol.h b/src/video/wayland/subsurface-client-protocol.h
deleted file mode 100644 (file)
index 4396ea4..0000000
+++ /dev/null
@@ -1,167 +0,0 @@
-/*
- * Copyright © 2012-2013 Collabora, Ltd.
- *
- * Permission to use, copy, modify, distribute, and sell this
- * software and its documentation for any purpose is hereby granted
- * without fee, provided that the above copyright notice appear in
- * all copies and that both that copyright notice and this permission
- * notice appear in supporting documentation, and that the name of
- * the copyright holders not be used in advertising or publicity
- * pertaining to distribution of the software without specific,
- * written prior permission.  The copyright holders make no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied
- * warranty.
- *
- * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
- * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY
- * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
- * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
- * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
- * THIS SOFTWARE.
- */
-
-#ifndef SUBSURFACE_CLIENT_PROTOCOL_H
-#define SUBSURFACE_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 wl_subcompositor;
-struct wl_subsurface;
-
-extern const struct wl_interface wl_subcompositor_interface;
-extern const struct wl_interface wl_subsurface_interface;
-
-#ifndef WL_SUBCOMPOSITOR_ERROR_ENUM
-#define WL_SUBCOMPOSITOR_ERROR_ENUM
-enum wl_subcompositor_error {
-        WL_SUBCOMPOSITOR_ERROR_BAD_SURFACE = 0,
-};
-#endif /* WL_SUBCOMPOSITOR_ERROR_ENUM */
-
-#define WL_SUBCOMPOSITOR_DESTROY        0
-#define WL_SUBCOMPOSITOR_GET_SUBSURFACE 1
-
-static inline void
-wl_subcompositor_set_user_data(struct wl_subcompositor *wl_subcompositor, void *user_data)
-{
-        wl_proxy_set_user_data((struct wl_proxy *) wl_subcompositor, user_data);
-}
-
-static inline void *
-wl_subcompositor_get_user_data(struct wl_subcompositor *wl_subcompositor)
-{
-        return wl_proxy_get_user_data((struct wl_proxy *) wl_subcompositor);
-}
-
-static inline void
-wl_subcompositor_destroy(struct wl_subcompositor *wl_subcompositor)
-{
-        wl_proxy_marshal((struct wl_proxy *) wl_subcompositor,
-                         WL_SUBCOMPOSITOR_DESTROY);
-
-        wl_proxy_destroy((struct wl_proxy *) wl_subcompositor);
-}
-
-static inline struct wl_subsurface *
-wl_subcompositor_get_subsurface(struct wl_subcompositor *wl_subcompositor, struct wl_surface *surface, struct wl_surface *parent)
-{
-        struct wl_proxy *id;
-
-        id = wl_proxy_create((struct wl_proxy *) wl_subcompositor,
-                             &wl_subsurface_interface);
-        if (!id)
-                return NULL;
-
-        wl_proxy_marshal((struct wl_proxy *) wl_subcompositor,
-                         WL_SUBCOMPOSITOR_GET_SUBSURFACE, id, surface, parent);
-
-        return (struct wl_subsurface *) id;
-}
-
-#ifndef WL_SUBSURFACE_ERROR_ENUM
-#define WL_SUBSURFACE_ERROR_ENUM
-enum wl_subsurface_error {
-        WL_SUBSURFACE_ERROR_BAD_SURFACE = 0,
-};
-#endif /* WL_SUBSURFACE_ERROR_ENUM */
-
-#define WL_SUBSURFACE_DESTROY   0
-#define WL_SUBSURFACE_SET_POSITION      1
-#define WL_SUBSURFACE_PLACE_ABOVE       2
-#define WL_SUBSURFACE_PLACE_BELOW       3
-#define WL_SUBSURFACE_SET_SYNC  4
-#define WL_SUBSURFACE_SET_DESYNC        5
-
-static inline void
-wl_subsurface_set_user_data(struct wl_subsurface *wl_subsurface, void *user_data)
-{
-        wl_proxy_set_user_data((struct wl_proxy *) wl_subsurface, user_data);
-}
-
-static inline void *
-wl_subsurface_get_user_data(struct wl_subsurface *wl_subsurface)
-{
-        return wl_proxy_get_user_data((struct wl_proxy *) wl_subsurface);
-}
-
-static inline void
-wl_subsurface_destroy(struct wl_subsurface *wl_subsurface)
-{
-        wl_proxy_marshal((struct wl_proxy *) wl_subsurface,
-                         WL_SUBSURFACE_DESTROY);
-
-        wl_proxy_destroy((struct wl_proxy *) wl_subsurface);
-}
-
-static inline void
-wl_subsurface_set_position(struct wl_subsurface *wl_subsurface, int32_t x, int32_t y)
-{
-        wl_proxy_marshal((struct wl_proxy *) wl_subsurface,
-                         WL_SUBSURFACE_SET_POSITION, x, y);
-}
-
-static inline void
-wl_subsurface_place_above(struct wl_subsurface *wl_subsurface, struct wl_surface *sibling)
-{
-        wl_proxy_marshal((struct wl_proxy *) wl_subsurface,
-                         WL_SUBSURFACE_PLACE_ABOVE, sibling);
-}
-
-static inline void
-wl_subsurface_place_below(struct wl_subsurface *wl_subsurface, struct wl_surface *sibling)
-{
-        wl_proxy_marshal((struct wl_proxy *) wl_subsurface,
-                         WL_SUBSURFACE_PLACE_BELOW, sibling);
-}
-
-static inline void
-wl_subsurface_set_sync(struct wl_subsurface *wl_subsurface)
-{
-        wl_proxy_marshal((struct wl_proxy *) wl_subsurface,
-                         WL_SUBSURFACE_SET_SYNC);
-}
-
-static inline void
-wl_subsurface_set_desync(struct wl_subsurface *wl_subsurface)
-{
-        wl_proxy_marshal((struct wl_proxy *) wl_subsurface,
-                         WL_SUBSURFACE_SET_DESYNC);
-}
-
-#ifdef  __cplusplus
-}
-#endif
-
-#endif
diff --git a/src/video/wayland/subsurface-protocol.c b/src/video/wayland/subsurface-protocol.c
deleted file mode 100644 (file)
index 3e67801..0000000
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright © 2012-2013 Collabora, Ltd.
- *
- * Permission to use, copy, modify, distribute, and sell this
- * software and its documentation for any purpose is hereby granted
- * without fee, provided that the above copyright notice appear in
- * all copies and that both that copyright notice and this permission
- * notice appear in supporting documentation, and that the name of
- * the copyright holders not be used in advertising or publicity
- * pertaining to distribution of the software without specific,
- * written prior permission.  The copyright holders make no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied
- * warranty.
- *
- * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
- * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY
- * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
- * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
- * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
- * THIS SOFTWARE.
- */
-
-#include <stdlib.h>
-#include <stdint.h>
-#include "wayland-util.h"
-
-extern const struct wl_interface wl_subsurface_interface;
-extern const struct wl_interface wl_surface_interface;
-extern const struct wl_interface wl_surface_interface;
-extern const struct wl_interface wl_surface_interface;
-extern const struct wl_interface wl_surface_interface;
-
-static const struct wl_interface *types[] = {
-        NULL,
-        NULL,
-        &wl_subsurface_interface,
-        &wl_surface_interface,
-        &wl_surface_interface,
-        &wl_surface_interface,
-        &wl_surface_interface,
-};
-
-static const struct wl_message wl_subcompositor_requests[] = {
-        { "destroy", "", types + 0 },
-        { "get_subsurface", "noo", types + 2 },
-};
-
-WL_EXPORT const struct wl_interface wl_subcompositor_interface = {
-        "wl_subcompositor", 1,
-        2, wl_subcompositor_requests,
-        0, NULL,
-};
-
-static const struct wl_message wl_subsurface_requests[] = {
-        { "destroy", "", types + 0 },
-        { "set_position", "ii", types + 0 },
-        { "place_above", "o", types + 5 },
-        { "place_below", "o", types + 6 },
-        { "set_sync", "", types + 0 },
-        { "set_desync", "", types + 0 },
-};
-
-WL_EXPORT const struct wl_interface wl_subsurface_interface = {
-        "wl_subsurface", 1,
-        6, wl_subsurface_requests,
-        0, NULL,
-};