Miroirs/csb
1
0
Fork 0
mirror of https://gitlab.com/CinnamonSlackBuilds/csb.git synced 2024-12-25 21:59:21 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

cogl: Upgraded to 1.22.4.

Browse source 
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackware-id.org>
This commit is contained in:
Willy Sudiarto Raharjo 2019-07-01 19:39:40 +07:00
parent e4132335fa
commit 3d88abe3cb
No known key found for this signature in database
GPG key ID: 887B8374D7333381
2 changed files with 5 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
cogl/cogl.SlackBuild
View file

@ -2,7 +2,7 @@
# Slackware build script for cogl # Slackware build script for cogl
# Copyright 2014-2018 Willy Sudiarto Raharjo <willysr@slackware-id.org> # Copyright 2014-2019 Willy Sudiarto Raharjo <willysr@slackware-id.org>
# All rights reserved. # All rights reserved.
# #
# Redistribution and use of this script, with or without modification, is # Redistribution and use of this script, with or without modification, is
@ -23,8 +23,8 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=cogl PRGNAM=cogl
VERSION=${VERSION:-1.22.2} VERSION=${VERSION:-1.22.4}
BUILD=${BUILD:-2} BUILD=${BUILD:-1}
TAG=${TAG:-_csb} TAG=${TAG:-_csb}
if [ -z "$ARCH" ]; then if [ -z "$ARCH" ]; then
@ -35,7 +35,7 @@ if [ -z "$ARCH" ]; then
esac esac
fi fi
wget -c https://github.com/GNOME/cogl/archive/$VERSION.tar.gz wget -c https://github.com/GNOME/cogl/archive/$VERSION/$PRGNAM-$VERSION.tar.gz
CWD=$(pwd) CWD=$(pwd)
TMP=${TMP:-/tmp/csb} TMP=${TMP:-/tmp/csb}
@ -62,7 +62,7 @@ rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT mkdir -p $TMP $PKG $OUTPUT
cd $TMP cd $TMP
rm -rf $PRGNAM-$VERSION rm -rf $PRGNAM-$VERSION
tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || tar xvf $CWD/$VERSION.tar.gz tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
cd $PRGNAM-$VERSION cd $PRGNAM-$VERSION
chown -R root:root . chown -R root:root .
find -L . \ find -L . \
@ -71,9 +71,6 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
patch -p1 < $CWD/wayland.patch
sed -i "s|1.15|1.16 1.15|g" autogen.sh
CFLAGS="$SLKCFLAGS" \ CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \
./autogen.sh \ ./autogen.sh \

25
cogl/wayland.patch
View file

@ -1,25 +0,0 @@
From da5e0859e15eeb93fa81bd645c93425f6acef0cd Mon Sep 17 00:00:00 2001
From: Felix Zhang <fezhang@suse.com>
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