Source Mage code commit list

[Pavel Vinogradov <scm AT sourcemage.org>]

GIT changes to master grimoire by Pavel Vinogradov <public AT sourcemage.org>:

 xorg-app/weston/BUILD                        |    3 +
 xorg-app/weston/DEPENDS                      |   64 
+++++++++++++++++----------
 xorg-app/weston/DETAILS                      |    1 
 xorg-app/weston/HISTORY                      |    6 ++
 xorg-app/weston/PRE_BUILD                    |    4 +
 xorg-app/weston/patches/editor-gobject.patch |   31 +++++++++++++
 6 files changed, 87 insertions(+), 22 deletions(-)

New commits:
commit a910755ccd629717a594e2be0adc97a341baae40
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

    xorg-app/weston: fixed linking error with glib2

commit b557ce4bb776ede2fb9acb819b950513b4199e96
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

    xorg-app/weston: mesonified, updated dependencies

diff --git a/xorg-app/weston/BUILD b/xorg-app/weston/BUILD
new file mode 100755
index 0000000..8a8a32f
--- /dev/null
+++ b/xorg-app/weston/BUILD
@@ -0,0 +1,3 @@
+# otherwise etnaviv in libdrm is required
+OPTS+=" simple-dmabuf-drm=auto" &&
+default_build
diff --git a/xorg-app/weston/DEPENDS b/xorg-app/weston/DEPENDS
index fd1bfcf..1ae8e49 100755
--- a/xorg-app/weston/DEPENDS
+++ b/xorg-app/weston/DEPENDS
@@ -1,5 +1,9 @@
+depends  meson     &&
+depends  ninja-build-system &&
+depends  python3   &&
 depends  pkgconfig &&
 depends  libpng    &&
+depends  libxkbcommon &&
 depends  MESA   &&
 depends  DEVICE-MANAGER &&
 depends  cairo     &&
@@ -11,27 +15,43 @@ depends  pixman    &&
 depends  glu       &&
 depends  wayland-protocols &&
 
-optional_depends dbus  '--enable-dbus' '--disable-dbus' 'DBus support' &&
-optional_depends libxkbcommon '' '--disable-xkbcommon' 'keyboard support'  &&
-optional_depends lcms2        '' '--disable-lcms' 'colour management' &&
-optional_depends colord       '' '' 'colour management daemon' &&
-optional_depends libunwind '' '--disable-libunwind' 'for backtraces'&&
-optional_depends libxcb '--enable-x11-compositor'  \
-                        '--disable-x11-compositor' \
-                        'Build the X11 compositor' &&
-optional_depends libwebp '' '' '' &&
+optional_depends lcms2 "color-management-lcms=true" \
+                       "color-management-lcms=false" \
+                       "colour management" &&
+optional_depends colord "color-management-colord=true" \
+                        "color-management-colord=false" \
+                        "colour management daemon" &&
+optional_depends libxcb "backend-x11=true" "backend-x11=false" \
+                        "Build the X11 compositor" &&
+optional_depends JPEG "image-jpeg=true" "image-jpeg=false" \
+                      "JPEG loading support" &&
+optional_depends libwebp "image-webp=true" "image-webp=false" \
+                         "WebP loading support" &&
 optional_depends libva   \
-                 '--enable-vaapi-recorder' \
-                 '--disable-vaapi-recorder' \
-                 'build vaapi recorder' &&
-optional_depends wayland '--enable-wayland-compositor' \
-                         '--disable-wayland-compositor'\
-                         'Build the Wayland (nested) compositor' &&
+                 "backend-drm-screencast-vaapi=true" \
+                 "backend-drm-screencast-vaapi=false" \
+                 "build vaapi recorder" &&
+optional_depends wayland "backend-wayland=true" \
+                         "backend-wayland=false" \
+                         "Build the Wayland (nested) compositor" &&
+optional_depends libdrm "backend-drm=true" "backend-drm=false" \
+                        "Build the DRM compositor" &&
+optional_depends linux-pam "weston-launch=true" "weston-launch=false" \
+                         "Build weston-launch"
+optional_depends pango "" "" "" &&
+optional_depends -sub "XWAYLAND" XSERVER \
+                "xwayland=true" \
+                "xwayland=false" \
+                "XWayland support" &&
+optional_depends systemd \
+                "systemd=true" \
+                "systemd=false" \
+                "systemd service plugin" &&
+optional_depends LOGIN-DAEMON "launcher-logind=true" "launcher-logind=false" 
\
+                 "logind protocol support" &&
+optional_depends freerdp "backend-rdp=true" "backend-rdp=false" "RDP 
compositor" &&
+
+if is_depends_enabled "${SPELL}" "libdrm"; then
+  optional_depends gstreamer-1.0 "remoting=true" "remoting=false" "remote 
output"
+fi
 
-optional_depends libdrm  '--enable-drm-compositor' \
-                         '--disable-drm-compositor'\
-                         'Build the DRM compositor' &&
-optional_depends linux-pam '--enable-weston-launch' \
-                         '--disable-weston-launch' \
-                         'Build weston-launch'
-optional_depends pango '' '' ''
diff --git a/xorg-app/weston/DETAILS b/xorg-app/weston/DETAILS
index c46047e..6e6dc3d 100755
--- a/xorg-app/weston/DETAILS
+++ b/xorg-app/weston/DETAILS
@@ -1,3 +1,4 @@
+. "${GRIMOIRE}/MESON_FUNCTIONS"
            SPELL=weston
          VERSION=6.0.0
           SOURCE=$SPELL-$VERSION.tar.xz
diff --git a/xorg-app/weston/HISTORY b/xorg-app/weston/HISTORY
index 4b2e822..66d2125 100644
--- a/xorg-app/weston/HISTORY
+++ b/xorg-app/weston/HISTORY
@@ -1,3 +1,9 @@
+2019-03-29 Pavel Vinogradov <public AT sourcemage.org>
+       * DEPENDS, DETAILS: mesonified, updated dependencies
+       * BUILD: added a workaround flag
+       * PRE_BUILD, patches/editor-gobject.patch: added upstream fix for
+         linking with glib2
+
 2019-03-28 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 6.0.0
 
diff --git a/xorg-app/weston/PRE_BUILD b/xorg-app/weston/PRE_BUILD
new file mode 100755
index 0000000..23e683b
--- /dev/null
+++ b/xorg-app/weston/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd  "${SOURCE_DIRECTORY}" &&
+
+apply_patch_dir patches
diff --git a/xorg-app/weston/patches/editor-gobject.patch 
b/xorg-app/weston/patches/editor-gobject.patch
new file mode 100644
index 0000000..151ffa6
--- /dev/null
+++ b/xorg-app/weston/patches/editor-gobject.patch
@@ -0,0 +1,31 @@
+From cbffca980b19fd6a6de14d9f2b4dca6a7711d9e0 Mon Sep 17 00:00:00 2001
+From: Pekka Paalanen <pekka.paalanen AT collabora.com>
+Date: Fri, 22 Mar 2019 13:58:30 +0200
+Subject: [PATCH] meson: link editor with gobject-2.0
+
+editor.c calls g_clear_object(), so it should link to gobject directly 
instead
+of relying on pangocairo pulling it in in its pkg-config.
+
+Fixes: https://gitlab.freedesktop.org/wayland/weston/issues/211
+
+Signed-off-by: Pekka Paalanen <pekka.paalanen AT collabora.com>
+---
+ clients/meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/clients/meson.build b/clients/meson.build
+index 47e9e8ce..53a94212 100644
+--- a/clients/meson.build
++++ b/clients/meson.build
+@@ -236,7 +236,7 @@ demo_clients = [
+                       text_input_unstable_v1_client_protocol_h,
+                       text_input_unstable_v1_protocol_c,
+               ],
+-              'deps': [ 'pangocairo' ]
++              'deps': [ 'pangocairo', 'gobject-2.0' ]
+       },
+       { 'basename': 'eventdemo' },
+       { 'basename': 'flower' },
+-- 
+2.18.1
+