Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (c8ea17e3b730c7963f8a96858f235ebb59bb8125)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (c8ea17e3b730c7963f8a96858f235ebb59bb8125)
  • Date: Wed, 2 Feb 2022 08:44:24 +0000

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

kde5-apps/falkon/DETAILS | 2
kde5-apps/falkon/HISTORY | 3
xorg-app/weston/BUILD | 18
++
xorg-app/weston/DEPENDS | 73
++++------
xorg-app/weston/DETAILS | 2
xorg-app/weston/HISTORY | 6
xorg-app/weston/PRE_BUILD | 7
xorg-app/weston/patches/0001-support-elogind-instead-of-systemd.patch | 61
++++++++
xorg-app/weston/patches/0002-meson-fix-fbdev-usage.patch | 39
+++++
9 files changed, 166 insertions(+), 45 deletions(-)

New commits:
commit c8ea17e3b730c7963f8a96858f235ebb59bb8125
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

weston tweaks

commit 8dc44927fd807312ab39b88021ab16a18a678d9a
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

weston: => 10.0.0

commit 5246736e7e8c1ba445e530e3dfe59c389ce7ba5f
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

falkon: => 3.2.0

diff --git a/kde5-apps/falkon/DETAILS b/kde5-apps/falkon/DETAILS
index d941603..87922af 100755
--- a/kde5-apps/falkon/DETAILS
+++ b/kde5-apps/falkon/DETAILS
@@ -1,5 +1,5 @@
SPELL=falkon
- VERSION=3.1.0
+ VERSION=3.2.0
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_URL=https://download.kde.org/stable/$SPELL/${VERSION%.?}/$SOURCE
SOURCE2=$SOURCE.sig
diff --git a/kde5-apps/falkon/HISTORY b/kde5-apps/falkon/HISTORY
index 3c3cd20..8d80628 100644
--- a/kde5-apps/falkon/HISTORY
+++ b/kde5-apps/falkon/HISTORY
@@ -1,3 +1,6 @@
+2022-01-31 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.2.0
+
2022-01-18 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: delete qtx11extras

diff --git a/xorg-app/weston/BUILD b/xorg-app/weston/BUILD
index 8a8a32f..689a184 100755
--- a/xorg-app/weston/BUILD
+++ b/xorg-app/weston/BUILD
@@ -1,3 +1,19 @@
+# this assumes that all options have been disabled
+#OPTS+=" systemd=true" &&
+#OPTS+=" launcher-logind=true" &&
+#OPTS+=" launcher-libseat=true" &&
+
+OPTS+=" renderer-gl=true" &&
+OPTS+=" simple-clients=egl" &&
+#OPTS+=" backend-drm=true" &&
+#OPTS+=" backend-wayland=true" &&
+OPTS+=" backend-default=auto" &&
+OPTS+=" shell-desktop=true" &&
+OPTS+=" shell-fullscreen=true" &&
+#OPTS+=" image-jpeg=true" &&
+OPTS+=" tools=terminal" &&
+
+#OPTS+=" =true" &&
# otherwise etnaviv in libdrm is required
-OPTS+=" simple-dmabuf-drm=auto" &&
+#OPTS+=" simple-dmabuf-drm=auto" &&
default_build
diff --git a/xorg-app/weston/DEPENDS b/xorg-app/weston/DEPENDS
index a5126d9..b813ea7 100755
--- a/xorg-app/weston/DEPENDS
+++ b/xorg-app/weston/DEPENDS
@@ -3,54 +3,43 @@ depends ninja-build-system &&
depends python3 &&
depends pkgconfig &&
depends libpng &&
-depends libxkbcommon &&
depends mesa &&
depends eudev &&
depends cairo &&
depends libinput &&
-depends poppler &&
-depends mtdev &&
+depends libevdev &&
+depends libxkbcommon &&
depends pixman &&
-depends glu &&
depends wayland-protocols &&
+optional_depends elogind launcher-logind=true '' 'login support' &&
+optional_depends seatd launcher-libseat=true '' 'seat support' &&

-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 \
- "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 "" "demo-clients=false" "build demo client" &&
-optional_depends xwayland \
- "xwayland=true" \
- "xwayland=false" \
- "XWayland support" &&
-optional_depends systemd \
- "systemd=true" \
- "systemd=false launcher-logind=false" \
- "systemd service plugin" &&
-
-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"
+optional_depends libdrm backend-drm=true '' 'Build the DRM compositor'
&&
+if is_depends_enabled ${SPELL} libdrm; then
+ optional_depends gstreamer-1.0 remoting=true '' 'remote output' &&
+ optional_depends pipewire pipewire=true '' 'pipewire plugin' &&
+ optional_depends libva backend-drm-screencast-vaapi=true '' 'build
vaapi recorder'
fi &&

-optional_depends pipewire "pipewire=true" "pipewire=false" "for pipewire
plugin"
+optional_depends wayland backend-wayland=true '' 'Build the Wayland (nested)
compositor' &&
+
+optional_depends libxcb backend-x11=true '' 'Build the X11 compositor'
&&
+
+optional_depends xwayland xwayland=true '' 'X11 support in wayland' &&
+optional_depends JPEG image-jpeg=true '' 'JPEG loading support' &&
+
+optional_depends lcms2 color-management-lcms=true '' 'colour management' &&
+if is_depends_enabled $SPELL lcms2;then
+ optional_depends colord color-management-colord=true '' 'colour management
daemon'
+fi &&
+optional_depends libwebp 'image-webp=true' 'image-webp=false' \
+ 'WebP loading support' &&
+
+
+if(false);then
+optional_depends pango '' 'demo-clients=false' 'build demo client' &&
+
+optional_depends freerdp 'backend-rdp=true' 'backend-rdp=false' 'RDP
compositor'
+
+
+fi
diff --git a/xorg-app/weston/DETAILS b/xorg-app/weston/DETAILS
index 7ae9e90..a692952 100755
--- a/xorg-app/weston/DETAILS
+++ b/xorg-app/weston/DETAILS
@@ -1,6 +1,6 @@
. "${GRIMOIRE}/MESON_FUNCTIONS"
SPELL=weston
- VERSION=9.0.0
+ VERSION=10.0.0
PATCHLEVEL=1
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/xorg-app/weston/HISTORY b/xorg-app/weston/HISTORY
index e2b5cdf..eaaaeb5 100644
--- a/xorg-app/weston/HISTORY
+++ b/xorg-app/weston/HISTORY
@@ -1,3 +1,9 @@
+2022-02-02 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 10.0.0
+ * DEPENDS: update
+ * PRE_BUILD, patches: added, fix bad fbdev usage
+ * BUILD: added
+
2021-02-28 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS: PATCHLEVEL++
* DEPENDS: updated xwayland dependency
diff --git a/xorg-app/weston/PRE_BUILD b/xorg-app/weston/PRE_BUILD
new file mode 100755
index 0000000..1c9f3ce
--- /dev/null
+++ b/xorg-app/weston/PRE_BUILD
@@ -0,0 +1,7 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+# set all options to false; simplifies build, depends scripts
+sed -i '/value/s/true/false/' meson_options.txt &&
+# disable failing tests
+sed -i '/tests/D' meson.build &&
+apply_patch_dir patches
diff --git
a/xorg-app/weston/patches/0001-support-elogind-instead-of-systemd.patch
b/xorg-app/weston/patches/0001-support-elogind-instead-of-systemd.patch
new file mode 100644
index 0000000..d085fc9
--- /dev/null
+++ b/xorg-app/weston/patches/0001-support-elogind-instead-of-systemd.patch
@@ -0,0 +1,61 @@
+From fbf7caad32998ebaf1b84fb33ebe5c4a34fa7a5e Mon Sep 17 00:00:00 2001
+From: Treeve Jelbert <treeve AT sourcemage.org>
+Date: Sat, 26 Jun 2021 14:41:59 +0200
+Subject: [PATCH 1/2] support elogind instead of systemd
+
+---
+ libweston/launcher-logind.c | 2 +-
+ libweston/meson.build | 6 +++---
+ libweston/weston-launch.c | 2 +-
+ 3 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/libweston/launcher-logind.c b/libweston/launcher-logind.c
+index 3fca1dff..c930adbe 100644
+--- a/libweston/launcher-logind.c
++++ b/libweston/launcher-logind.c
+@@ -35,7 +35,7 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <sys/stat.h>
+-#include <systemd/sd-login.h>
++#include <elogind/sd-login.h>
+ #include <unistd.h>
+
+ #include <libweston/libweston.h>
+diff --git a/libweston/meson.build b/libweston/meson.build
+index 257d6950..029ada45 100644
+--- a/libweston/meson.build
++++ b/libweston/meson.build
+@@ -156,13 +156,13 @@ endif
+
+ systemd_dep = dependency('', required: false)
+ if get_option('launcher-logind')
+- systemd_dep = dependency('libsystemd', version: '>= 209', required:
false)
++ systemd_dep = dependency('libelogind', version: '>= 209', required:
false)
+ if systemd_dep.found()
+ config_h.set('HAVE_SYSTEMD_LOGIN_209', '1')
+ else
+- systemd_dep = dependency('libsystemd-login', version: '>=
198', required: false)
++# systemd_dep = dependency('libsystemd-login', version: '>=
198', required: false)
+ if not systemd_dep.found()
+- error('logind support requires libsystemd or
libsystemd-login but neither was found. Or, you can use
\'-Dlauncher-logind=false\'')
++ error('logind support requires elogind but it was
found. Or, you can use \'-Dlauncher-logind=false\'')
+ endif
+ endif
+
+diff --git a/libweston/weston-launch.c b/libweston/weston-launch.c
+index c43ed7b2..db389318 100644
+--- a/libweston/weston-launch.c
++++ b/libweston/weston-launch.c
+@@ -54,7 +54,7 @@
+ #include <security/pam_appl.h>
+
+ #ifdef HAVE_SYSTEMD_LOGIN
+-#include <systemd/sd-login.h>
++#include <elogind/sd-login.h>
+ #endif
+
+ #include "weston-launch.h"
+--
+2.35.1
+
diff --git a/xorg-app/weston/patches/0002-meson-fix-fbdev-usage.patch
b/xorg-app/weston/patches/0002-meson-fix-fbdev-usage.patch
new file mode 100644
index 0000000..1e807f5
--- /dev/null
+++ b/xorg-app/weston/patches/0002-meson-fix-fbdev-usage.patch
@@ -0,0 +1,39 @@
+From 825b70ac11282df1065cd7d1a968bdcc0d524938 Mon Sep 17 00:00:00 2001
+From: Treeve Jelbert <treeve AT sourcemage.org>
+Date: Thu, 27 Jan 2022 14:20:59 +0100
+Subject: [PATCH 2/2] meson - fix fbdev usage
+
+---
+ meson.build | 2 +-
+ meson_options.txt | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index afadcb2c..61ab239f 100644
+--- a/meson.build
++++ b/meson.build
+@@ -121,7 +121,7 @@ config_h.set10('TEST_GL_RENDERER',
get_option('test-gl-renderer'))
+
+ backend_default = get_option('backend-default')
+ if backend_default == 'auto'
+- foreach b : [ 'headless', 'fbdev', 'x11', 'wayland', 'drm' ]
++ foreach b : [ 'headless', 'x11', 'wayland', 'drm' ]
+ if get_option('backend-' + b)
+ backend_default = b
+ endif
+diff --git a/meson_options.txt b/meson_options.txt
+index 8a527d74..f8a715d8 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -53,7 +53,7 @@ option(
+ option(
+ 'backend-default',
+ type: 'combo',
+- choices: [ 'auto', 'drm', 'wayland', 'x11', 'fbdev', 'headless' ],
++ choices: [ 'auto', 'drm', 'wayland', 'x11', 'headless' ],
+ value: 'drm',
+ description: 'Default backend when no parent display server detected'
+ )
+--
+2.35.1
+



  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (c8ea17e3b730c7963f8a96858f235ebb59bb8125), Treeve Jelbert, 02/02/2022

Archive powered by MHonArc 2.6.24.

Top of Page