Merge branch 'devel/tizen' into tizen

Change-Id: I165a75f552835b9608a7d4ea6a64a21dcca3449f

diff --git a/drm_slp/drm_slp_bufmgr.c b/drm_slp/drm_slp_bufmgr.c
index b5ae07d..3082c23 100755 (executable)
--- a/drm_slp/drm_slp_bufmgr.c
+++ b/drm_slp/drm_slp_bufmgr.c
@@ -79,17 +79,17 @@ drm_slp_bo_import(drm_slp_bufmgr bufmgr, unsigned int key)
     return (drm_slp_bo)bo;
 }
 
-unsigned int
+void *
 drm_slp_bo_map(drm_slp_bo bo, int device, int opt)
 {
     tbm_bo_handle bo_handle;
-    unsigned int ret = 0;
+    void *ret = NULL;
 
     bo_handle = tbm_bo_map ((tbm_bo)bo, device, opt);
     if (bo_handle.ptr == NULL)
     {
         TBM_LOG ("[libdrm_slp:%d]: error bo_handle is null\n", getpid());
-        return 0;
+        return NULL;
     }
 
     switch (device)
@@ -98,14 +98,14 @@ drm_slp_bo_map(drm_slp_bo bo, int device, int opt)
         case TBM_DEVICE_2D:
         case TBM_DEVICE_3D:
         case TBM_DEVICE_MM:
-            ret = (unsigned int)bo_handle.u32;
+            ret = (void *)((uintptr_t)bo_handle.u32);
             break;
         case TBM_DEVICE_CPU:
-            ret = (unsigned int)bo_handle.ptr;
+            ret = bo_handle.ptr;
             break;
         default:
             TBM_LOG ("[libdrm_slp:%d]: error wrong device type\n", getpid());
-            return 0;
+            return NULL;
     }
 
     return ret;

diff --git a/drm_slp/drm_slp_bufmgr.h b/drm_slp/drm_slp_bufmgr.h
index 0add67a..43147f6 100644 (file)
--- a/drm_slp/drm_slp_bufmgr.h
+++ b/drm_slp/drm_slp_bufmgr.h
@@ -43,7 +43,7 @@ void           drm_slp_bufmgr_destroy(drm_slp_bufmgr bufmgr);
 /*Functions for bo*/
 void         drm_slp_bo_unref(drm_slp_bo bo);
 drm_slp_bo drm_slp_bo_import(drm_slp_bufmgr bufmgr, unsigned int key);
-unsigned int drm_slp_bo_map(drm_slp_bo bo, int device, int opt);
+void *drm_slp_bo_map(drm_slp_bo bo, int device, int opt);
 int          drm_slp_bo_unmap(drm_slp_bo bo, int device);
 
 #endif /* _DRM_SLP_BUFMGR_H_ */

diff --git a/packaging/libtbm.spec b/packaging/libtbm.spec
index e929637..4b24e36 100644 (file)
--- a/packaging/libtbm.spec
+++ b/packaging/libtbm.spec
@@ -2,8 +2,8 @@
 %bcond_with wayland
 
 Name:           libtbm
-Version:        1.1.0
-Release:        3
+Version:        1.1.1
+Release:        1
 License:        MIT
 Summary:        The library for Tizen Buffer Manager
 Group:          System/Libraries