mirror of
https://git.FreeBSD.org/ports.git
synced 2024-12-25 04:43:33 +00:00
8a016444ba
Update evolution-dataserver to 3.38.0 and because of ABI breakage update ports depending on it Update bijiben to 3.38.0 Update gnome-calendar to 3.38.0 Update gnome-contacts to 3.38 Update gnome-maps to 3.38.0 Patch gnome-todo to work with newer evolution-dataserver (patched obtained from OpenBSD/Archlinux) Update evolution to 3.38.0 Update evolution-ews to 3.38.0 (among changes it brings support for office365) Update folks to 0.14.0 Update cheese to 3.38.0 Update aisleriot to 3.22.9 Update five-or-more to 3.22.2 Update fastream to 0.2.9 Update gnome-control-center to 3.36.4 Update gnmoe-settings-daemon to 3.38.0 Update meld to 3.21.0 Update gnome-desktop to 3.38.0 and because of ABI breakage bump portrevision of all dependant ports not touched by this update Update gnome-session to 3.38.0 Update gnome-shell to 3.36.6, now run depends on gdm Update gnome-shell-extensions to 3.36.3 Update mutter to 3.36.6
82 lines
2.7 KiB
C
82 lines
2.7 KiB
C
$OpenBSD: patch-src_backends_meta-egl_c,v 1.2 2018/04/26 09:19:27 jasper Exp $
|
|
|
|
Revert non-portable portion of:
|
|
From b7b5fb293d1de3af9e533f2063749fde7a790945 Mon Sep 17 00:00:00 2001
|
|
From: Daniel Stone <daniels@collabora.com>
|
|
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 2020-09-07 19:18:23 UTC
|
|
+++ src/backends/meta-egl.c
|
|
@@ -69,8 +69,6 @@ struct _MetaEgl
|
|
PFNEGLSTREAMCONSUMERACQUIREKHRPROC eglStreamConsumerAcquireKHR;
|
|
PFNEGLSTREAMCONSUMERACQUIREATTRIBNVPROC eglStreamConsumerAcquireAttribNV;
|
|
|
|
- PFNEGLQUERYDMABUFFORMATSEXTPROC eglQueryDmaBufFormatsEXT;
|
|
- PFNEGLQUERYDMABUFMODIFIERSEXTPROC eglQueryDmaBufModifiersEXT;
|
|
};
|
|
|
|
G_DEFINE_TYPE (MetaEgl, meta_egl, G_TYPE_OBJECT)
|
|
@@ -1019,51 +1017,6 @@ meta_egl_stream_consumer_acquire (MetaEgl *egl,
|
|
return TRUE;
|
|
}
|
|
|
|
-gboolean
|
|
-meta_egl_query_dma_buf_formats (MetaEgl *egl,
|
|
- EGLDisplay display,
|
|
- EGLint max_formats,
|
|
- EGLint *formats,
|
|
- EGLint *num_formats,
|
|
- GError **error)
|
|
-{
|
|
- if (!is_egl_proc_valid (egl->eglQueryDmaBufFormatsEXT, error))
|
|
- return FALSE;
|
|
-
|
|
- if (!egl->eglQueryDmaBufFormatsEXT (display, max_formats, formats,
|
|
- num_formats))
|
|
- {
|
|
- set_egl_error (error);
|
|
- return FALSE;
|
|
- }
|
|
-
|
|
- return TRUE;
|
|
-}
|
|
-
|
|
-gboolean
|
|
-meta_egl_query_dma_buf_modifiers (MetaEgl *egl,
|
|
- EGLDisplay display,
|
|
- EGLint format,
|
|
- EGLint max_modifiers,
|
|
- EGLuint64KHR *modifiers,
|
|
- EGLBoolean *external_only,
|
|
- EGLint *num_modifiers,
|
|
- GError **error)
|
|
-{
|
|
- if (!is_egl_proc_valid (egl->eglQueryDmaBufModifiersEXT, error))
|
|
- return FALSE;
|
|
-
|
|
- if (!egl->eglQueryDmaBufModifiersEXT (display, format, max_modifiers,
|
|
- modifiers, external_only,
|
|
- num_modifiers))
|
|
- {
|
|
- set_egl_error (error);
|
|
- return FALSE;
|
|
- }
|
|
-
|
|
- return TRUE;
|
|
-}
|
|
-
|
|
#define GET_EGL_PROC_ADDR(proc) \
|
|
egl->proc = (void *) eglGetProcAddress (#proc);
|
|
|
|
@@ -1100,8 +1053,6 @@ meta_egl_constructed (GObject *object)
|
|
GET_EGL_PROC_ADDR (eglStreamConsumerAcquireKHR);
|
|
GET_EGL_PROC_ADDR (eglStreamConsumerAcquireAttribNV);
|
|
|
|
- GET_EGL_PROC_ADDR (eglQueryDmaBufFormatsEXT);
|
|
- GET_EGL_PROC_ADDR (eglQueryDmaBufModifiersEXT);
|
|
}
|
|
|
|
#undef GET_EGL_PROC_ADDR
|