[patch] Patch: Do not rely on qtgui private header for libdrm and egl

0001-Do-not-rely-on-qtgui-private-header-for-libdrm-and-e.patch (text/plain), 3.40 KB, created by Alfred Wingate on 2023-03-30 15:29:50 UTC

From 14b690977a811f124944427bfbd1ca7032cd5bc6 Mon Sep 17 00:00:00 2001
From: Alfred Wingate <[e-mail]>
Date: Thu, 30 Mar 2023 18:07:39 +0300
Subject: [PATCH] Do not rely on qtgui private header for libdrm and egl

This would fix configuring issues where qtgui was built without libdrm.
Difference in behavior otherwise is that dmabuf-server-buffer now is
enabled depending on libdrm and egl are installed on the system, rather
than if they were installed when qtgui was installed.

Signed-off-by: Alfred Wingate <[e-mail]>
---
 src/client/configure.json     | 32 ++++++++++++++++++++++++++++++++
 src/compositor/configure.json | 32 ++++++++++++++++++++++++++++++++
 2 files changed, 64 insertions(+)

diff --git a/src/client/configure.json b/src/client/configure.json
index 29222357..a28c49c8 100644
--- a/src/client/configure.json
+++ b/src/client/configure.json
@@ -7,6 +7,38 @@
     "testDir": "../../config.tests",
 
     "libraries": {
+        "egl": {
+            "label": "EGL",
+            "test": {
+                "main": [
+                    "EGLint x = 0; EGLDisplay dpy = 0; EGLContext ctx = 0;",
+                    "eglDestroyContext(dpy, ctx);"
+                ]
+            },
+            "headers": "EGL/egl.h",
+            "sources": [
+                { "type": "pkgConfig", "args": "egl" }
+            ]
+        },
+        "drm": {
+            "label": "KMS",
+            "test": {
+                "head": [
+                    "#include <stdlib.h>",
+                    "#include <stdint.h>",
+                    "extern \"C\" {"
+                ],
+                "tail": [
+                    "}"
+                ],
+                "main": "(void) drmModeGetCrtc(0, 0);"
+            },
+            "headers": [ "xf86drmMode.h", "xf86drm.h" ],
+            "sources": [
+                { "type": "pkgConfig", "args": "libdrm" },
+                { "libs": "-ldrm" }
+            ]
+        },
         "wayland-client": {
             "label": "Wayland client library",
             "headers": "wayland-version.h",
diff --git a/src/compositor/configure.json b/src/compositor/configure.json
index da95d07b..ed3e4a6c 100644
--- a/src/compositor/configure.json
+++ b/src/compositor/configure.json
@@ -7,6 +7,38 @@
     "testDir": "../../config.tests",
 
     "libraries": {
+        "egl": {
+            "label": "EGL",
+            "test": {
+                "main": [
+                    "EGLint x = 0; EGLDisplay dpy = 0; EGLContext ctx = 0;",
+                    "eglDestroyContext(dpy, ctx);"
+                ]
+            },
+            "headers": "EGL/egl.h",
+            "sources": [
+                { "type": "pkgConfig", "args": "egl" }
+            ]
+        },
+        "drm": {
+            "label": "KMS",
+            "test": {
+                "head": [
+                    "#include <stdlib.h>",
+                    "#include <stdint.h>",
+                    "extern \"C\" {"
+                ],
+                "tail": [
+                    "}"
+                ],
+                "main": "(void) drmModeGetCrtc(0, 0);"
+            },
+            "headers": [ "xf86drmMode.h", "xf86drm.h" ],
+            "sources": [
+                { "type": "pkgConfig", "args": "libdrm" },
+                { "libs": "-ldrm" }
+            ]
+        },
         "wayland-client": {
             "label": "Wayland client library",
             "headers": "wayland-version.h",
-- 
2.40.0