Update wayland_sha1 and implement buffer_pool interface

Change-Id: I0628a7655a6deb061a5d0b6c6304c89d8655cf11
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>

2 files changed, 6 insertions, 2 deletions

diff --git a/tests/auto/compositor/mockclient.cpp b/tests/auto/compositor/mockclient.cpp
index 5dabfcd57..4b04164b6 100644
--- a/tests/auto/compositor/mockclient.cpp
+++ b/tests/auto/compositor/mockclient.cpp
@@ -167,7 +167,8 @@ ShmBuffer::ShmBuffer(const QSize &size, wl_shm *shm)
     }
 
     image = QImage(static_cast<uchar *>(data), size.width(), size.height(), stride, QImage::Format_ARGB32_Premultiplied);
-    handle = wl_shm_create_buffer(shm,fd, size.width(), size.height(),
+    shm_pool = wl_shm_create_pool(shm,fd,alloc);
+    handle = wl_shm_pool_create_buffer(shm_pool,0, size.width(), size.height(),
                                    stride, WL_SHM_FORMAT_ARGB8888);
     close(fd);
 }
@@ -176,5 +177,6 @@ ShmBuffer::~ShmBuffer()
 {
     munmap(image.bits(), image.byteCount());
     wl_buffer_destroy(handle);
+    wl_shm_pool_destroy(shm_pool);
 }
 
diff --git a/tests/auto/compositor/mockclient.h b/tests/auto/compositor/mockclient.h
index 2f2f665cd..e6be12fe7 100644
--- a/tests/auto/compositor/mockclient.h
+++ b/tests/auto/compositor/mockclient.h
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 
+#include "string.h"
 #include "wayland-client.h"
 
 #include <QObject>
@@ -51,7 +52,8 @@ public:
     ShmBuffer(const QSize &size, wl_shm *shm);
     ~ShmBuffer();
 
-    wl_buffer *handle;
+    struct wl_buffer *handle;
+    struct wl_shm_pool *shm_pool;
     QImage image;
 };