Commit 93353d09 authored by Olivier Duchateau's avatar Olivier Duchateau
Browse files

Update to 3.36.8

parent 9971f1b1
# Created by: Pawel Worach <pawel.worach@gmail.com>
# $FreeBSD: head/x11-wm/mutter/Makefile 517000 2019-11-07 18:36:55Z zeising $
# $FreeBSD: head/x11-wm/mutter/Makefile 553752 2020-10-31 08:37:04Z jbeich $
PORTNAME= mutter
PORTVERSION= 3.36.6
PORTVERSION= 3.36.8
CATEGORIES= x11-wm
MASTER_SITES= GNOME
DIST_SUBDIR= gnome
......@@ -15,7 +15,9 @@ LICENSE_FILE= ${WRKSRC}/COPYING
BUILD_DEPENDS= zenity>=3.0.0:x11/zenity \
xkeyboard-config>=0:x11/xkeyboard-config \
gsettings-desktop-schemas>=3.4.0:devel/gsettings-desktop-schemas
gsettings-desktop-schemas>=3.4.0:devel/gsettings-desktop-schemas \
gnome-settings-daemon>0:sysutils/gnome-settings-daemon \
evdev-proto>0:devel/evdev-proto
LIB_DEPENDS= libstartup-notification-1.so:x11/startup-notification \
libfribidi.so:converters/fribidi \
libxkbcommon.so:x11/libxkbcommon \
......@@ -36,7 +38,7 @@ PORTSCOUT= limitw:1,even
USES= compiler:c++0x gettext gl gnome localbase meson \
pkgconfig tar:xz xorg
USE_GL= egl
USE_GL= egl gbm
USE_GNOME= atk cairo gdkpixbuf2 gnomedesktop3 introspection
USE_XORG= ice sm x11 xcb xcomposite xcursor xdamage xext xfixes \
xi xinerama xrandr xrender xtst
......@@ -44,14 +46,20 @@ USE_LDCONFIG= yes
CFLAGS+= -Wno-unknown-warning-option \
-Wno-format-nonliteral
CPPFLAGS+= -fno-omit-frame-pointer
MESON_ARGS= -Dglx=false \
-Dnative_backend=false \
-Dremote_desktop=false \
-Dudev=false \
MESON_ARGS= -Dlibwacom=false \
-Dwayland=false \
-Dlibwacom=false \
-Dudev=false \
-Dnative_backend=false \
-Dprofiler=false \
-Dtests=false
-Dtests=false \
-Dsm=true
# Required by embedded cogl/clutter forks.
MESON_ARGS+= -Dopengl_libname=libGL.so \
-Dgles2_libname=libGLESv2
# Disable remote_desktop for now because it requires memfd which only appears current
MESON_ARGS+= -Dremote_desktop=false
GLIB_SCHEMAS= org.gnome.mutter.gschema.xml \
org.gnome.mutter.wayland.gschema.xml
......
TIMESTAMP = 1600532897
SHA256 (gnome/mutter-3.36.6.tar.xz) = 7fab160eecf4299e445e24aa34b5e903745ffcc256f82b7f267cd106e435e034
SIZE (gnome/mutter-3.36.6.tar.xz) = 2689156
TIMESTAMP = 1610887100
SHA256 (gnome/mutter-3.36.8.tar.xz) = e30d1847aa4a67a97d92df0cd97792505e1094a4de83208246175f79796a44f3
SIZE (gnome/mutter-3.36.8.tar.xz) = 2690932
--- meson.build.orig 2020-09-28 15:41:47 UTC
+++ meson.build
@@ -320,22 +320,6 @@ if buildtype != 'plain'
'-Wmissing-include-dirs',
'-Wlogical-op',
'-Wignored-qualifiers',
- '-Werror=redundant-decls',
- '-Werror=implicit',
- '-Werror=nonnull',
- '-Werror=init-self',
- '-Werror=main',
- '-Werror=missing-braces',
- '-Werror=sequence-point',
- '-Werror=return-type',
- '-Werror=trigraphs',
- '-Werror=array-bounds',
- '-Werror=write-strings',
- '-Werror=address',
- '-Werror=int-to-pointer-cast',
- '-Werror=pointer-to-int-cast',
- '-Werror=empty-body',
- '-Werror=write-strings',
]
supported_warnings = cc.get_supported_arguments(all_warnings)
add_project_arguments(supported_warnings, language: 'c')
......@@ -7,9 +7,9 @@ Date: Tue, 11 Jul 2017 16:03:26 +0100
Subject: [PATCH] wayland: Add zwp_linux_dmabuf_v1 support
Index: src/backends/meta-egl.c
--- src/backends/meta-egl.c.orig
--- src/backends/meta-egl.c.orig 2020-09-07 19:18:23 UTC
+++ src/backends/meta-egl.c
@@ -67,8 +67,6 @@ struct _MetaEgl
@@ -69,8 +69,6 @@ struct _MetaEgl
PFNEGLSTREAMCONSUMERACQUIREKHRPROC eglStreamConsumerAcquireKHR;
PFNEGLSTREAMCONSUMERACQUIREATTRIBNVPROC eglStreamConsumerAcquireAttribNV;
......@@ -18,7 +18,7 @@ Index: src/backends/meta-egl.c
};
G_DEFINE_TYPE (MetaEgl, meta_egl, G_TYPE_OBJECT)
@@ -926,51 +924,6 @@ meta_egl_stream_consumer_acquire (MetaEgl *egl,
@@ -1019,51 +1017,6 @@ meta_egl_stream_consumer_acquire (MetaEgl *egl,
return TRUE;
}
......@@ -70,7 +70,7 @@ Index: src/backends/meta-egl.c
#define GET_EGL_PROC_ADDR(proc) \
egl->proc = (void *) eglGetProcAddress (#proc);
@@ -1007,8 +960,6 @@ meta_egl_constructed (GObject *object)
@@ -1100,8 +1053,6 @@ meta_egl_constructed (GObject *object)
GET_EGL_PROC_ADDR (eglStreamConsumerAcquireKHR);
GET_EGL_PROC_ADDR (eglStreamConsumerAcquireAttribNV);
......
......@@ -132,6 +132,7 @@ include/mutter-6/cogl/cogl/cogl-fence.h
include/mutter-6/cogl/cogl/cogl-frame-info.h
include/mutter-6/cogl/cogl/cogl-framebuffer.h
include/mutter-6/cogl/cogl/cogl-glib-source.h
include/mutter-6/cogl/cogl/cogl-glx.h
include/mutter-6/cogl/cogl/cogl-gtype-private.h
include/mutter-6/cogl/cogl/cogl-index-buffer.h
include/mutter-6/cogl/cogl/cogl-indices.h
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment