Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
aports
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
651
Issues
651
List
Boards
Labels
Service Desk
Milestones
Merge Requests
215
Merge Requests
215
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
alpine
aports
Commits
08e98ec7
Commit
08e98ec7
authored
Feb 16, 2017
by
Natanael Copa
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
main/cogl: upgrade to 1.22.2
parent
79328ebb
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
34 additions
and
17 deletions
+34
-17
main/cogl/APKBUILD
main/cogl/APKBUILD
+9
-17
main/cogl/fix-an-incorrect-preprocessor-conditional.patch
main/cogl/fix-an-incorrect-preprocessor-conditional.patch
+25
-0
No files found.
main/cogl/APKBUILD
View file @
08e98ec7
# Contributor: Carlo Landmeter <clandmeter@gmail.com>
# Contributor: Carlo Landmeter <clandmeter@gmail.com>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname
=
cogl
pkgname
=
cogl
pkgver
=
1.22.
0
pkgver
=
1.22.
2
pkgrel
=
0
pkgrel
=
0
pkgdesc
=
"An object oriented GL/GLES Abstraction/Utility Layer"
pkgdesc
=
"An object oriented GL/GLES Abstraction/Utility Layer"
url
=
"http://www.clutter-project.org/"
url
=
"http://www.clutter-project.org/"
...
@@ -14,21 +14,14 @@ depends_dev="glib-dev mesa-dev libdrm-dev libxdamage-dev libxcomposite-dev
...
@@ -14,21 +14,14 @@ depends_dev="glib-dev mesa-dev libdrm-dev libxdamage-dev libxcomposite-dev
makedepends
=
"
$depends_dev
"
makedepends
=
"
$depends_dev
"
install
=
""
install
=
""
subpackages
=
"
$pkgname
-dev
$pkgname
-lang"
subpackages
=
"
$pkgname
-dev
$pkgname
-lang"
source
=
"https://download.gnome.org/sources/cogl/
${
pkgver
%.*
}
/cogl-
$pkgver
.tar.xz"
source
=
"https://download.gnome.org/sources/cogl/
${
pkgver
%.*
}
/cogl-
$pkgver
.tar.xz
fix-an-incorrect-preprocessor-conditional.patch
"
_builddir
=
"
$srcdir
"
/cogl-
$pkgver
builddir
=
"
$srcdir
"
/cogl-
$pkgver
prepare
()
{
local
i
cd
"
$_builddir
"
for
i
in
$source
;
do
case
$i
in
*
.patch
)
msg
$i
;
patch
-p1
-i
"
$srcdir
"
/
$i
||
return
1
;;
esac
done
}
build
()
{
build
()
{
cd
"
$
_
builddir
"
cd
"
$builddir
"
./configure
\
./configure
\
--build
=
$CBUILD
\
--build
=
$CBUILD
\
--host
=
$CHOST
\
--host
=
$CHOST
\
...
@@ -48,10 +41,9 @@ build() {
...
@@ -48,10 +41,9 @@ build() {
}
}
package
()
{
package
()
{
cd
"
$
_
builddir
"
cd
"
$builddir
"
make
DESTDIR
=
"
$pkgdir
"
install
||
return
1
make
DESTDIR
=
"
$pkgdir
"
install
||
return
1
}
}
md5sums
=
"ab684ec96848d79d22757fb3064820c8 cogl-1.22.0.tar.xz"
sha512sums
=
"2ec99f5ff22683d12925b9a1f748387b47c4506aaf3c5afec851b3b6fe6b7cdfd211fb7e4359bd7a1d1b7cb3cb7fbd257efbcb7d2941d0f133a60bad1c9645e3 cogl-1.22.2.tar.xz
sha256sums
=
"689dfb5d14fc1106e9d2ded0f7930dcf7265d0bc84fa846b4f03941633eeaa91 cogl-1.22.0.tar.xz"
260618252826f27858f8141effbfff1447472f8a928ca347b454354d4336234a2043b8b7bd8290c3f2f2034422e227168b787a28cb68334caf3626cce94db81f fix-an-incorrect-preprocessor-conditional.patch"
sha512sums
=
"b19edced4282bd2b828357391fd6175feb483acfec87e344b7719215924dc8996dc8162d7b39d62a108d4f3ebd426caeefeab4e16b6c1962cc3383c239d6c359 cogl-1.22.0.tar.xz"
main/cogl/fix-an-incorrect-preprocessor-conditional.patch
0 → 100644
View file @
08e98ec7
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