bootstrap: pkgs::wayland

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

Author: Andy-Python-Programmer

bootstrap.yml

@@ -124,13 +124,42 @@ sources:
     regenerate:
       - args: ['autoreconf', '-f', '-i']
 
+  - name: 'pkg-config'
+    subdir: 'bundled'
+    git: 'https://gitlab.freedesktop.org/pkg-config/pkg-config.git'
+    tag: 'pkg-config-0.29.2'
+    version: '0.29.2'
+    tools_required:
+      - host-autoconf-v2.69
+      - host-automake-v1.16
+      - host-libtool
+    regenerate:
+      - args: ['./autogen.sh']
+        environ:
+          'NOCONFIGURE': 'yes'
+
   - name: wayland
     subdir: 'bundled'
     git: 'https://github.com/wayland-project/wayland.git'
     tag: '1.20.0'
     version: '1.20.0'
 
 tools:
+  # We could run an external pkg-config; however, we need the aclocal files.
+  # The easiest way to ensure that they are available is to just install pkg-config.
+  - name: host-pkg-config
+    exports_aclocal: true
+    from_source: pkg-config
+    configure:
+      - args:
+        - '@THIS_SOURCE_DIR@/configure'
+        - '--prefix=@PREFIX@'
+        - '--with-internal-glib'
+    compile:
+      - args: ['make', '-j@PARALLELISM@']
+    install:
+      - args: ['make', 'install']
+
   - name: host-autoconf-v2.69
     source:
       name: autoconf-v2.69
@@ -371,9 +400,14 @@ tools:
 
   - name: wayland-scanner
     from_source: wayland
+    tools_required:
+      - virtual: pkgconfig-for-host
+        program_name: host-pkg-config
     configure:
       - args:
         - 'meson'
+        - '--native-file'
+        - '@SOURCE_ROOT@/userland/native-file.ini'
         - '--prefix=@PREFIX@'
         - '-Ddtd_validation=false'
         - '-Ddocumentation=false'
@@ -916,7 +950,7 @@ packages:
         - '-j@PARALLELISM@'
       - args: ['make', 'install', 'INSTALL_TOP=@THIS_COLLECT_DIR@/usr']
 
-  # -------------------- wayland (wayland-protocols, wayland-scanner, wayland, libexpat, host-libtool, libffi) --------------------
+  # -------------------- wayland --------------------
   - name: wayland-protocols
     source:
       subdir: 'bundled'
@@ -1003,39 +1037,111 @@ packages:
         - '--with-sysroot=@SYSROOT_DIR@' # Set libtool's lt_sysroot.
     build:
       - args: ['make', '-j@PARALLELISM@']
-      - args: ['make', 'install']
+      - args: ['make', 'install-strip']
         environ:
           DESTDIR: '@THIS_COLLECT_DIR@'
-        quiet: true
 
-  # - name: wayland
-  #   from_source: wayland
+  - name: wayland
+    from_source: wayland
+    tools_required:
+      - host-pkg-config
+      - host-gcc
+      - wayland-scanner
+      - host-libtool
+      - virtual: pkgconfig-for-target
+        triple: "x86_64-aero"
+      - virtual: pkgconfig-for-host
+        program_name: host-pkg-config
+    pkgs_required:
+      - mlibc
+      - libexpat
+      - libffi
+    configure:
+      - args:
+        - 'meson'
+        - '--native-file'
+        - '@SOURCE_ROOT@/userland/native-file.ini'
+        - '--cross-file'
+        - '@SOURCE_ROOT@/userland/cross-file.ini'
+        - '--prefix=/usr'
+        - '--buildtype=debugoptimized'
+        - '-Ddtd_validation=false'
+        - '-Ddocumentation=false'
+        - '-Dscanner=false'
+        - '@THIS_SOURCE_DIR@'
+        environ:
+          PKG_CONFIG_SYSROOT_DIR: '@BUILD_ROOT@/system-root'
+    build:
+      - args: ['ninja']
+      - args: ['ninja', 'install']
+        environ:
+          DESTDIR: '@THIS_COLLECT_DIR@'
+
+  # - name: weston
+  #   labels: [aarch64]
+  #   architecture: '@OPTION:arch@'
+  #   source:
+  #     subdir: 'ports'
+  #     git: 'https://github.com/wayland-project/weston.git'
+  #     tag: '10.0.0'
+  #     version: '10.0.0'
   #   tools_required:
-  #     - host-gcc
-  #     - wayland-scanner
+  #     - host-autoconf-v2.69
+  #     - host-automake-v1.15
   #     - host-libtool
+  #     - host-pkg-config
+  #     - system-gcc
+  #     - wayland-scanner
+  #     - virtual: pkgconfig-for-target
+  #       triple: "@OPTION:arch-triple@"
+  #     - virtual: pkgconfig-for-host
+  #       program_name: host-pkg-config
   #   pkgs_required:
   #     - mlibc
-  #     - libexpat
-  #     - libffi
+  #     - cairo
+  #     - libinput
+  #     - libxkbcommon
+  #     - mesa
+  #     - wayland
+  #     - wayland-protocols
+  #     - dejavu
+  #     - libxcursor
+  #     - xorg-server
+  #     - pango
+  #     - glib
+  #     - libjpeg-turbo
   #   configure:
   #     - args:
   #       - 'meson'
+  #       - '--native-file'
+  #       - '@SOURCE_ROOT@/scripts/meson.native-file'
   #       - '--cross-file'
-  #       - '@SOURCE_ROOT@/userland/cross-file.ini'
+  #       - '@SOURCE_ROOT@/scripts/meson-@OPTION:arch-triple@.cross-file'
   #       - '--prefix=/usr'
+  #       - '--libdir=lib'
   #       - '--buildtype=debugoptimized'
-  #       - '-Ddtd_validation=false'
-  #       - '-Ddocumentation=false'
-  #       - '-Dscanner=false'
+  #       - '-Dbackend-x11=false'
+  #       - '-Dsimple-clients=damage,im,egl,shm,touch'
+  #       - '-Dimage-jpeg=true'
+  #       - '-Dimage-webp=false'
+  #       - '-Dlauncher-logind=false'
+  #       - '-Dbackend-drm-screencast-vaapi=false'
+  #       - '-Dbackend-rdp=false'
+  #       - '-Dcolor-management-colord=false'
+  #       - '-Dcolor-management-lcms=false'
+  #       - '-Dsystemd=false'
+  #       - '-Dremoting=false'
+  #       - '-Dpipewire=false'
   #       - '@THIS_SOURCE_DIR@'
   #       environ:
   #         PKG_CONFIG_SYSROOT_DIR: '@BUILD_ROOT@/system-root'
+  #         PKG_CONFIG_LIBDIR: '@BUILD_ROOT@/system-root/usr/lib/pkgconfig:@BUILD_ROOT@/system-root/usr/share/pkgconfig'
   #   build:
   #     - args: ['ninja']
   #     - args: ['ninja', 'install']
   #       environ:
   #         DESTDIR: '@THIS_COLLECT_DIR@'
+  #       quiet: true
 
 tasks:
   - name: sysroot

patches/wayland/wayland.patch

@@ -0,0 +1,71 @@
+From 845a4f951b9165576f6b930385bfef82b61394fc Mon Sep 17 00:00:00 2001
+From: Andy-Python-Programmer <[email protected]>
+Date: Thu, 26 May 2022 19:09:39 +1000
+Subject: [PATCH] wayland: aero specific changes
+
+Signed-off-by: Andy-Python-Programmer <[email protected]>
+---
+ .gitignore           | 2 ++
+ src/wayland-os.c     | 1 +
+ src/wayland-server.c | 2 ++
+ tests/test-runner.c  | 1 +
+ 4 files changed, 6 insertions(+)
+
+diff --git a/.gitignore b/.gitignore
+index 4fefe5d..7013a49 100644
+--- a/.gitignore
++++ b/.gitignore
+@@ -6,3 +6,5 @@
+ *~
+ cscope.out
+ ctags
++
++.vscode
+\ No newline at end of file
+diff --git a/src/wayland-os.c b/src/wayland-os.c
+index 27c6035..43f7b00 100644
+--- a/src/wayland-os.c
++++ b/src/wayland-os.c
+@@ -27,6 +27,7 @@
+ 
+ #include "../config.h"
+ 
++#include <stddef.h>
+ #include <sys/types.h>
+ #include <sys/socket.h>
+ #include <unistd.h>
+diff --git a/src/wayland-server.c b/src/wayland-server.c
+index 02f1365..d4cf79b 100644
+--- a/src/wayland-server.c
++++ b/src/wayland-server.c
+@@ -1490,6 +1490,7 @@ wl_socket_lock(struct wl_socket *socket)
+ {
+ 	struct stat socket_stat;
+ 
++	/* lockfiles are currently not supported on aero.
+ 	snprintf(socket->lock_addr, sizeof socket->lock_addr,
+ 		 "%s%s", socket->addr.sun_path, LOCK_SUFFIX);
+ 
+@@ -1518,6 +1519,7 @@ wl_socket_lock(struct wl_socket *socket)
+ 		   socket_stat.st_mode & S_IWGRP) {
+ 		unlink(socket->addr.sun_path);
+ 	}
++	*/
+ 
+ 	return 0;
+ err_fd:
+diff --git a/tests/test-runner.c b/tests/test-runner.c
+index c0247b5..47280d1 100644
+--- a/tests/test-runner.c
++++ b/tests/test-runner.c
+@@ -27,6 +27,7 @@
+ #define _GNU_SOURCE
+ 
+ #include <unistd.h>
++#include <signal.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <sys/types.h>
+-- 
+2.25.1
+

userland/cross-file.ini

@@ -4,6 +4,7 @@ cpp = 'x86_64-aero-g++'
 ar = 'x86_64-aero-ar'
 strip = 'x86_64-aero-strip'
 ld = 'x86_64-aero-ld'
+pkgconfig = 'x86_64-aero-pkg-config'
 
 [host_machine]
 system = 'aero'

userland/native-file.ini

@@ -0,0 +1,2 @@
+[binaries]
+pkgconfig = 'host-pkg-config'