bootstrap: add libdrm

Signed-off-by: Andy-Python-Programmer <[email protected]>

Author: Andy-Python-Programmer

bootstrap.yml

@@ -508,6 +508,40 @@ packages:
         environ:
           DESTDIR: '@THIS_COLLECT_DIR@'
 
+  - name: libdrm
+    source:
+      subdir: 'bundled'
+      git: 'https://gitlab.freedesktop.org/mesa/drm'
+      tag: 'libdrm-2.4.110'
+      version: '2.4.110'
+    tools_required:
+      - host-gcc
+    pkgs_required:
+      - mlibc
+    configure:
+      - args:
+        - 'meson'
+        - '--cross-file'
+        - '@SOURCE_ROOT@/userland/cross-file.ini'
+        - '--prefix=/usr'
+        - '--libdir=lib'
+        - '--buildtype=debugoptimized'
+        - '-Dintel=false'
+        - '-Dvmwgfx=false'
+        - '-Dradeon=false'
+        - '-Damdgpu=false'
+        - '-Dnouveau=false'
+        - '-Dman-pages=false'
+        # We might want to build cairo with OpenGL support.
+        # Doing so would introduce a circular dependency here.
+        - '-Dcairo-tests=false'
+        - '@THIS_SOURCE_DIR@'
+    build:
+    - args: ['ninja']
+    - args: ['ninja', 'install']
+      environ:
+        DESTDIR: '@THIS_COLLECT_DIR@'
+
   - name: nyancat
     source:
       subdir: 'bundled'

patches/libdrm/libdrm.patch

@@ -0,0 +1,147 @@
+From c1dbfc87b74825c0f21b9031fc932d27908fcc71 Mon Sep 17 00:00:00 2001
+From: Andy-Python-Programmer <[email protected]>
+Date: Sat, 14 May 2022 14:42:38 +1000
+Subject: [PATCH] drm: aero specific changes
+
+Signed-off-by: Andy-Python-Programmer <[email protected]>
+---
+ .gitignore        |  1 +
+ include/drm/drm.h |  4 ++--
+ xf86drm.c         | 20 ++++++++++----------
+ xf86drm.h         |  2 +-
+ 4 files changed, 14 insertions(+), 13 deletions(-)
+
+diff --git a/.gitignore b/.gitignore
+index 0ec9e7f..e0c197e 100644
+--- a/.gitignore
++++ b/.gitignore
+@@ -1 +1,2 @@
+ /build*
++.vscode
+diff --git a/include/drm/drm.h b/include/drm/drm.h
+index 398c396..3e35299 100644
+--- a/include/drm/drm.h
++++ b/include/drm/drm.h
+@@ -35,10 +35,10 @@
+ #ifndef _DRM_H_
+ #define _DRM_H_
+ 
+-#if   defined(__linux__)
++#if defined(__linux__) || defined(__aero__)
+ 
++#include <sys/ioctl.h>
+ #include <linux/types.h>
+-#include <asm/ioctl.h>
+ typedef unsigned int drm_handle_t;
+ 
+ #else /* One of the BSDs */
+diff --git a/xf86drm.c b/xf86drm.c
+index 5933e4b..2b79641 100644
+--- a/xf86drm.c
++++ b/xf86drm.c
+@@ -3346,7 +3346,7 @@ drm_public int drmCloseBufferHandle(int fd, uint32_t handle)
+ 
+ static char *drmGetMinorNameForFD(int fd, int type)
+ {
+-#ifdef __linux__
++#if defined(__linux__) || defined(__aero__)
+     DIR *sysdir;
+     struct dirent *ent;
+     struct stat sbuf;
+@@ -3468,7 +3468,7 @@ drm_public char *drmGetRenderDeviceNameFromFd(int fd)
+     return drmGetMinorNameForFD(fd, DRM_NODE_RENDER);
+ }
+ 
+-#ifdef __linux__
++#if defined(__linux__) || defined(__aero__)
+ static char * DRM_PRINTFLIKE(2, 3)
+ sysfs_uevent_get(const char *path, const char *fmt, ...)
+ {
+@@ -3515,7 +3515,7 @@ sysfs_uevent_get(const char *path, const char *fmt, ...)
+ /* Little white lie to avoid major rework of the existing code */
+ #define DRM_BUS_VIRTIO 0x10
+ 
+-#ifdef __linux__
++#if defined(__linux__) || defined(__aero__)
+ static int get_subsystem_type(const char *device_path)
+ {
+     char path[PATH_MAX + 1] = "";
+@@ -3581,7 +3581,7 @@ static int drmParseSubsystemType(int maj, int min)
+ #endif
+ }
+ 
+-#ifdef __linux__
++#if defined(__linux__) || defined(__aero__)
+ static void
+ get_pci_path(int maj, int min, char *pci_path)
+ {
+@@ -3661,7 +3661,7 @@ static int get_sysctl_pci_bus_info(int maj, int min, drmPciBusInfoPtr info)
+ 
+ static int drmParsePciBusInfo(int maj, int min, drmPciBusInfoPtr info)
+ {
+-#ifdef __linux__
++#if defined(__linux__) || defined(__aero__)
+     unsigned int ___domain, bus, dev, func;
+     char pci_path[PATH_MAX + 1], *value;
+     int num;
+@@ -3770,7 +3770,7 @@ static int drmGetMaxNodeName(void)
+            3 /* length of the node number */;
+ }
+ 
+-#ifdef __linux__
++#if defined(__linux__) || defined(__aero__)
+ static int parse_separate_sysfs_files(int maj, int min,
+                                       drmPciDeviceInfoPtr device,
+                                       bool ignore_revision)
+@@ -3848,7 +3848,7 @@ static int drmParsePciDeviceInfo(int maj, int min,
+                                  drmPciDeviceInfoPtr device,
+                                  uint32_t flags)
+ {
+-#ifdef __linux__
++#if defined(__linux__) || defined(__aero__)
+     if (!(flags & DRM_DEVICE_GET_PCI_REVISION))
+         return parse_separate_sysfs_files(maj, min, device, true);
+ 
+@@ -4072,7 +4072,7 @@ free_device:
+     return ret;
+ }
+ 
+-#ifdef __linux__
++#if defined(__linux__) || defined(__aero__)
+ static int drm_usb_dev_path(int maj, int min, char *path, size_t len)
+ {
+     char *value, *tmp_path, *slash;
+@@ -4160,7 +4160,7 @@ static int drmParseUsbBusInfo(int maj, int min, drmUsbBusInfoPtr info)
+ 
+ static int drmParseUsbDeviceInfo(int maj, int min, drmUsbDeviceInfoPtr info)
+ {
+-#ifdef __linux__
++#if defined(__linux__) || defined(__aero__)
+     char path[PATH_MAX + 1], *value;
+     unsigned int vendor, product;
+     int ret;
+@@ -4760,7 +4760,7 @@ drm_public int drmGetDevices(drmDevicePtr devices[], int max_devices)
+ 
+ drm_public char *drmGetDeviceNameFromFd2(int fd)
+ {
+-#ifdef __linux__
++#if defined(__linux__) || defined(__aero__)
+     struct stat sbuf;
+     char path[PATH_MAX + 1], *value;
+     unsigned int maj, min;
+diff --git a/xf86drm.h b/xf86drm.h
+index 1631396..a2118f1 100644
+--- a/xf86drm.h
++++ b/xf86drm.h
+@@ -47,7 +47,7 @@ extern "C" {
+ #define DRM_MAX_MINOR   16
+ #endif
+ 
+-#if defined(__linux__)
++#if defined(__linux__) || defined(__aero__)
+ 
+ #define DRM_IOCTL_NR(n)		_IOC_NR(n)
+ #define DRM_IOC_VOID		_IOC_NONE
+-- 
+2.25.1
+