Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
aports
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
814
Issues
814
List
Boards
Labels
Milestones
Merge Requests
43
Merge Requests
43
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
alpine
aports
Commits
042c5849
Commit
042c5849
authored
May 07, 2019
by
Leo
Committed by
Natanael Copa
May 30, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
main/cogl: upgrade to 1.22.4
parent
1af6d902
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
31 additions
and
44 deletions
+31
-44
APKBUILD
main/cogl/APKBUILD
+31
-19
fix-an-incorrect-preprocessor-conditional.patch
main/cogl/fix-an-incorrect-preprocessor-conditional.patch
+0
-25
No files found.
main/cogl/APKBUILD
View file @
042c5849
# Contributor: Carlo Landmeter <clandmeter@gmail.com>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname
=
cogl
pkgver
=
1.22.
2
pkgver
=
1.22.
4
pkgrel
=
0
pkgdesc
=
"An object oriented GL/GLES Abstraction/Utility Layer"
url
=
"http://www.clutter-project.org/"
options
=
"!check"
# All tests fail for unknown reasons
url
=
"https://blogs.gnome.org/clutter/"
arch
=
"all"
license
=
"GPL-2.0"
depends
=
""
depends_dev
=
"glib-dev mesa-dev libdrm-dev libxdamage-dev libxcomposite-dev
libxrandr-dev gdk-pixbuf-dev
pango-dev cairo-dev gobject-introspection-dev libxext-dev eudev-dev"
makedepends
=
"
$depends_dev
"
install
=
""
subpackages
=
"
$pkgname
-dev
$pkgname
-lang"
source
=
"https://download.gnome.org/sources/cogl/
${
pkgver
%.*
}
/cogl-
$pkgver
.tar.xz
fix-an-incorrect-preprocessor-conditional.patch
license
=
"MIT"
makedepends
=
"
automake
autoconf
libtool
libxcomposite-dev
libxrandr-dev
mesa-dev
gdk-pixbuf-dev
wayland-dev
pango-dev
cairo-dev
gobject-introspection-dev
"
subpackages
=
"
$pkgname
-dev
$pkgname
-lang"
source
=
"https://download.gnome.org/sources/cogl/
${
pkgver
%.*
}
/cogl-
$pkgver
.tar.xz"
builddir
=
"
$srcdir
"
/cogl-
$pkgver
prepare
()
{
default_prepare
autoreconf
-fi
}
build
()
{
cd
"
$builddir
"
...
...
@@ -35,15 +44,18 @@ build() {
--enable-kms-egl-platform
\
--enable-gl
\
--enable-gdk-pixbuf
\
||
return
1
make
||
return
1
--enable-introspection
\
--enable-cairo
\
--enable-wayland-egl-platform
\
--enable-wayland-egl-server
make
}
package
()
{
cd
"
$builddir
"
make
DESTDIR
=
"
$pkgdir
"
install
||
return
1
make
DESTDIR
=
"
$pkgdir
"
install
rm
-rf
"
$pkgdir
"
/usr/share/cogl/examples-data/crate.jpg
}
sha512sums
=
"2ec99f5ff22683d12925b9a1f748387b47c4506aaf3c5afec851b3b6fe6b7cdfd211fb7e4359bd7a1d1b7cb3cb7fbd257efbcb7d2941d0f133a60bad1c9645e3 cogl-1.22.2.tar.xz
260618252826f27858f8141effbfff1447472f8a928ca347b454354d4336234a2043b8b7bd8290c3f2f2034422e227168b787a28cb68334caf3626cce94db81f fix-an-incorrect-preprocessor-conditional.patch"
sha512sums
=
"85f3af49c16dd2e545a3b91c076ac10107a4b9d0dc785cefe489e91eabdd82837f732685f1f0dca1695fc2f8095f42d5f30f145b659eb4295964787f06c1e37a cogl-1.22.4.tar.xz"
main/cogl/fix-an-incorrect-preprocessor-conditional.patch
deleted
100644 → 0
View file @
1af6d902
From b583e21d8698dbd58013320cfb47739102efdea7 Mon Sep 17 00:00:00 2001
From: Kalev Lember <klember at redhat.com>
Date: Wed, 19 Oct 2016 23:38:28 +0200
Subject: [PATCH] Fix an incorrect preprocessor conditional
This fixes the build with wayland wayland egl server support disabled.
---
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 39bfd884..4a9f3aa6 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.11.0
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment