summaryrefslogtreecommitdiffstats
path: root/xorg-app
diff options
context:
space:
mode:
authorPavel Vinogradov2019-03-29 17:16:00 -0400
committerPavel Vinogradov2019-03-29 17:16:00 -0400
commitb557ce4bb776ede2fb9acb819b950513b4199e96 (patch)
tree16caba7a2b3aa59e35d3316c19edff606f482e64 /xorg-app
parent06a69706aceff163542dc96bba3fab84e82e66ec (diff)
xorg-app/weston: mesonified, updated dependencies
Diffstat (limited to 'xorg-app')
-rwxr-xr-xxorg-app/weston/BUILD3
-rwxr-xr-xxorg-app/weston/DEPENDS64
-rwxr-xr-xxorg-app/weston/DETAILS1
-rw-r--r--xorg-app/weston/HISTORY4
4 files changed, 50 insertions, 22 deletions
diff --git a/xorg-app/weston/BUILD b/xorg-app/weston/BUILD
new file mode 100755
index 0000000000..8a8a32f650
--- /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 fd1bfcf5b3..1ae8e49c26 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 c46047effc..6e6dc3d29e 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 4b2e8228e5..27e0f73a85 100644
--- a/xorg-app/weston/HISTORY
+++ b/xorg-app/weston/HISTORY
@@ -1,3 +1,7 @@
+2019-03-29 Pavel Vinogradov <public@sourcemage.org>
+ * DEPENDS, DETAILS: mesonified, updated dependencies
+ * BUILD: added a workaround flag
+
2019-03-28 Treeve Jelbert <treeve@sourcemage.org>
* DETAILS: version 6.0.0