diff --git a/cogl/cogl.SlackBuild b/cogl/cogl.SlackBuild index dbca87c..9663eeb 100644 --- a/cogl/cogl.SlackBuild +++ b/cogl/cogl.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for cogl -# Copyright 2014-2015 Willy Sudiarto Raharjo +# Copyright 2014-2017 Willy Sudiarto Raharjo # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,8 +23,8 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=cogl -VERSION=${VERSION:-1.22.0} -BUILD=${BUILD:-2} +VERSION=${VERSION:-1.22.2} +BUILD=${BUILD:-1} TAG=${TAG:-_csb} if [ -z "$ARCH" ]; then @@ -71,6 +71,8 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +patch -p1 < $CWD/wayland.patch + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./autogen.sh \ diff --git a/cogl/wayland.patch b/cogl/wayland.patch new file mode 100644 index 0000000..60c3ff4 --- /dev/null +++ b/cogl/wayland.patch @@ -0,0 +1,25 @@ +From da5e0859e15eeb93fa81bd645c93425f6acef0cd Mon Sep 17 00:00:00 2001 +From: Felix Zhang +Date: Mon, 29 Aug 2016 15:02:14 +0800 +Subject: [PATCH] fix build failure with -Werror=undef + +--- + cogl/winsys/cogl-winsys-egl.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/cogl/winsys/cogl-winsys-egl.c b/cogl/winsys/cogl-winsys-egl.c +index 39bfd88..4a9f3aa 100644 +--- a/cogl/winsys/cogl-winsys-egl.c ++++ b/cogl/winsys/cogl-winsys-egl.c +@@ -1029,7 +1029,7 @@ _cogl_egl_create_image (CoglContext *ctx, + egl_ctx = EGL_NO_CONTEXT; + else + #endif +-#if COGL_HAS_WAYLAND_EGL_SERVER_SUPPORT ++#ifdef COGL_HAS_WAYLAND_EGL_SERVER_SUPPORT + /* The WL_bind_wayland_display spec states that EGL_NO_CONTEXT is to be used + * in conjunction with the EGL_WAYLAND_BUFFER_WL target */ + if (target == EGL_WAYLAND_BUFFER_WL) +-- +2.6.6 +