r50296 - in /desktop/unstable/mutter/debian: changelog patches/fix-undef-build-failure.patch patches/series rules
jbicha-guest at users.alioth.debian.org
jbicha-guest at users.alioth.debian.org
Sun Sep 11 04:43:10 UTC 2016
Author: jbicha-guest
Date: Sun Sep 11 04:43:09 2016
New Revision: 50296
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=50296
Log:
Add git patch needed for build without wayland
Added:
desktop/unstable/mutter/debian/patches/fix-undef-build-failure.patch
Modified:
desktop/unstable/mutter/debian/changelog
desktop/unstable/mutter/debian/patches/series
desktop/unstable/mutter/debian/rules
Modified: desktop/unstable/mutter/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/mutter/debian/changelog?rev=50296&op=diff
==============================================================================
--- desktop/unstable/mutter/debian/changelog [utf-8] (original)
+++ desktop/unstable/mutter/debian/changelog [utf-8] Sun Sep 11 04:43:09 2016
@@ -1,8 +1,9 @@
mutter (3.21.91-3) UNRELEASED; urgency=medium
* debian/rules:
- - Try to fix the build on kfreebsd by explicitly disabling kms & wayland
- there
+ - Explicitly disable kms and wayland to fix build on kfreebsd
+ * Add fix-undef-build-failure.patch:
+ - Git patch needed for build without wayland
-- Jeremy Bicha <jbicha at ubuntu.com> Sat, 10 Sep 2016 19:46:37 -0400
Added: desktop/unstable/mutter/debian/patches/fix-undef-build-failure.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/mutter/debian/patches/fix-undef-build-failure.patch?rev=50296&op=file
==============================================================================
--- desktop/unstable/mutter/debian/patches/fix-undef-build-failure.patch (added)
+++ desktop/unstable/mutter/debian/patches/fix-undef-build-failure.patch [utf-8] Sun Sep 11 04:43:09 2016
@@ -0,0 +1,27 @@
+From ce7573e2b75789a701cbc75c17a118e067fda3d6 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl at gmail.com>
+Date: Fri, 2 Sep 2016 14:20:40 +0800
+Subject: cogl/egl: Fix non-Wayland build
+
+Use #ifdef instead of #if, otherwise it won't compile when Wayland is
+not available.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=770647
+---
+ cogl/cogl/winsys/cogl-winsys-egl.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cogl/cogl/winsys/cogl-winsys-egl.c b/cogl/cogl/winsys/cogl-winsys-egl.c
+index 36122f2..dbf14f6 100644
+--- a/cogl/cogl/winsys/cogl-winsys-egl.c
++++ b/cogl/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)
+
Modified: desktop/unstable/mutter/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/mutter/debian/patches/series?rev=50296&op=diff
==============================================================================
--- desktop/unstable/mutter/debian/patches/series [utf-8] (original)
+++ desktop/unstable/mutter/debian/patches/series [utf-8] Sun Sep 11 04:43:09 2016
@@ -1 +1,2 @@
01_Wcast-align.patch
+fix-undef-build-failure.patch
Modified: desktop/unstable/mutter/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/mutter/debian/rules?rev=50296&op=diff
==============================================================================
--- desktop/unstable/mutter/debian/rules [utf-8] (original)
+++ desktop/unstable/mutter/debian/rules [utf-8] Sun Sep 11 04:43:09 2016
@@ -14,6 +14,13 @@
CONFFLAGS = \
--enable-wayland \
--enable-native-backend
+else
+CONFFLAGS += \
+ --disable-wayland-egl-platform \
+ --disable-wayland-egl-server \
+ --disable-kms-egl-platform \
+ --disable-wayland \
+ --disable-native-backend
endif
override_dh_auto_configure:
More information about the pkg-gnome-commits
mailing list