pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
xwayland: rename from modular-xorg-xwayland
Module Name: pkgsrc-wip
Committed By: kikadf <kikadf.01%gmail.com@localhost>
Pushed By: kikadf
Date: Sun Jan 4 16:06:52 2026 +0100
Changeset: 0f6d9ff8c8037b886ed2dde617b5f61768f2548b
Modified Files:
Makefile
labwc/Makefile
wlroots/Makefile
Added Files:
xwayland/DESCR
xwayland/Makefile
xwayland/PLIST
xwayland/buildlink3.mk
xwayland/distinfo
Removed Files:
modular-xorg-xwayland/DESCR
modular-xorg-xwayland/Makefile
modular-xorg-xwayland/PLIST
modular-xorg-xwayland/buildlink3.mk
modular-xorg-xwayland/distinfo
Log Message:
xwayland: rename from modular-xorg-xwayland
Try to build with native X11
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=0f6d9ff8c8037b886ed2dde617b5f61768f2548b
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
Makefile | 2 +-
labwc/Makefile | 5 ++--
modular-xorg-xwayland/DESCR | 8 ------
modular-xorg-xwayland/Makefile | 53 -----------------------------------
modular-xorg-xwayland/PLIST | 5 ----
modular-xorg-xwayland/buildlink3.mk | 13 ---------
modular-xorg-xwayland/distinfo | 5 ----
wlroots/Makefile | 7 ++---
xwayland/DESCR | 8 ++++++
xwayland/Makefile | 56 +++++++++++++++++++++++++++++++++++++
xwayland/PLIST | 5 ++++
xwayland/buildlink3.mk | 13 +++++++++
xwayland/distinfo | 5 ++++
13 files changed, 93 insertions(+), 92 deletions(-)
diffs:
diff --git a/Makefile b/Makefile
index b9dea1b1ce..0e25fa363e 100644
--- a/Makefile
+++ b/Makefile
@@ -2443,7 +2443,6 @@ SUBDIR+= modular-xorg-server-dfbsd
SUBDIR+= modular-xorg-server-dfbsd-meson
SUBDIR+= modular-xorg-server-linux
SUBDIR+= modular-xorg-xspice
-SUBDIR+= modular-xorg-xwayland
SUBDIR+= moe
SUBDIR+= mofilereader
SUBDIR+= mona
@@ -6217,6 +6216,7 @@ SUBDIR+= xtrkcad
SUBDIR+= xu4
SUBDIR+= xwallpaper
SUBDIR+= xwax
+SUBDIR+= xwayland
SUBDIR+= xwelltris
SUBDIR+= xwindiff
SUBDIR+= yabar
diff --git a/labwc/Makefile b/labwc/Makefile
index 386b67b828..8c04f04b19 100644
--- a/labwc/Makefile
+++ b/labwc/Makefile
@@ -45,9 +45,8 @@ post-install:
.include "../../sysutils/dbus/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
-.if ${X11_TYPE} == "modular"
-.include "../../wip/modular-xorg-xwayland/buildlink3.mk"
-.endif
+# NOTYET
+#.include "../../wip/xwayland/buildlink3.mk"
.include "../../wip/libsfdo/buildlink3.mk"
.include "../../wip/wlroots/buildlink3.mk"
diff --git a/modular-xorg-xwayland/DESCR b/modular-xorg-xwayland/DESCR
deleted file mode 100644
index 3092639c39..0000000000
--- a/modular-xorg-xwayland/DESCR
+++ /dev/null
@@ -1,8 +0,0 @@
-XWayland is a fully fledged X server implementation that acts as a proxy
-between X11 clients and a Wayland compositor.
-
-It runs as a specialized Wayland client, while optionally using a set of
-XWayland specific Wayland protocols for implementing certain functionality.
-
-The Wayland compositor acts both as the Wayland display server XWayland
-connects to, as well as the window manager.
diff --git a/modular-xorg-xwayland/Makefile b/modular-xorg-xwayland/Makefile
deleted file mode 100644
index aedcd014e0..0000000000
--- a/modular-xorg-xwayland/Makefile
+++ /dev/null
@@ -1,53 +0,0 @@
-# $NetBSD: Makefile,v 1.20 2025/01/24 20:50:27 riastradh Exp $
-
-DISTNAME= xwayland-24.1.8
-PKGNAME= modular-xorg-${DISTNAME}
-CATEGORIES= x11
-MASTER_SITES= ${MASTER_SITE_XORG:=xserver/}
-EXTRACT_SUFX= .tar.xz
-
-MAINTAINER= pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE= https://xorg.freedesktop.org/
-COMMENT= Server for running X clients under Wayland from modular X.org
-LICENSE= mit AND modified-bsd AND x11 # with no-advertising clause
-
-USE_TOOLS+= pkg-config
-
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "NetBSD"
-MESON_ARGS+= -Dsecure-rpc=false
-. if ${OPSYS_VERSION} < 100000
-CPPFLAGS+= -D_OPENBSD_SOURCE # reallocarray
-. endif
-.endif
-
-.include "../../devel/wayland/platform.mk"
-
-.if empty(PLATFORM_SUPPORTS_WAYLAND:M[Yy][Ee][Ss])
-PKG_SKIP_REASON+= "Platform does not support Wayland"
-.endif
-
-post-install:
- ${RM} ${DESTDIR}${PREFIX}/lib/xorg/protocol.txt
- ${RM} ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/Xserver.1
- if [ -f ${DESTDIR}${PREFIX}/share/doc/xorg-server/Xserver-DTrace.xml ]; then \
- ${RM} ${DESTDIR}${PREFIX}/share/doc/xorg-server/Xserver-DTrace.xml; \
- fi
-
-# New package
-.include "../../wip/input-headers/buildlink3.mk"
-
-.include "../../devel/wayland/buildlink3.mk"
-.include "../../devel/wayland-protocols/buildlink3.mk"
-.include "../../x11/xorgproto/buildlink3.mk"
-.include "../../graphics/libepoxy/buildlink3.mk"
-.include "../../x11/libXfont2/buildlink3.mk"
-.include "../../x11/libxcvt/buildlink3.mk"
-.include "../../x11/libdrm/buildlink3.mk"
-.include "../../x11/libei/buildlink3.mk"
-.include "../../x11/libxkbfile/buildlink3.mk"
-.include "../../x11/pixman/buildlink3.mk"
-.include "../../x11/xtrans/buildlink3.mk"
-.include "../../devel/meson/build.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/modular-xorg-xwayland/PLIST b/modular-xorg-xwayland/PLIST
deleted file mode 100644
index 86cb194133..0000000000
--- a/modular-xorg-xwayland/PLIST
+++ /dev/null
@@ -1,5 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2023/03/30 08:45:05 wiz Exp $
-bin/Xwayland
-lib/pkgconfig/xwayland.pc
-man/man1/Xwayland.1
-share/applications/org.freedesktop.Xwayland.desktop
diff --git a/modular-xorg-xwayland/buildlink3.mk b/modular-xorg-xwayland/buildlink3.mk
deleted file mode 100644
index ec8571193d..0000000000
--- a/modular-xorg-xwayland/buildlink3.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# $NetBSD$
-
-BUILDLINK_TREE+= modular-xorg-xwayland
-
-.if !defined(MODULAR_XORG_XWAYLAND_BUILDLINK3_MK)
-MODULAR_XORG_XWAYLAND_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.modular-xorg-xwayland+= modular-xorg-xwayland>=24.1.8
-BUILDLINK_PKGSRCDIR.modular-xorg-xwayland?= ../../wip/modular-xorg-xwayland
-
-.endif # MODULAR_XORG_XWAYLAND_BUILDLINK3_MK
-
-BUILDLINK_TREE+= -modular-xorg-xwayland
diff --git a/modular-xorg-xwayland/distinfo b/modular-xorg-xwayland/distinfo
deleted file mode 100644
index ff100a8a2d..0000000000
--- a/modular-xorg-xwayland/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.1 2023/03/30 08:45:19 wiz Exp $
-
-BLAKE2s (xwayland-24.1.8.tar.xz) = acdf29ff06043260371d917bb8cc0471b13c988e7f3c86ffae734c7b22b18a41
-SHA512 (xwayland-24.1.8.tar.xz) = 417498baa87e6bfc11a778d31788a2b2d381efa08f2ac8308cfd8b1828ea62ba1da43542f798f124c25b51e8229ad1bdffc252462c0abf51be8fa0337f26d7e2
-Size (xwayland-24.1.8.tar.xz) = 1303408 bytes
diff --git a/wlroots/Makefile b/wlroots/Makefile
index 600e26fe8f..91398cf607 100644
--- a/wlroots/Makefile
+++ b/wlroots/Makefile
@@ -32,11 +32,10 @@ PLIST_VARS+= xwayland
.include "../../wip/seatd/buildlink3.mk"
.include "../../wip/vulkan-loader/buildlink3.mk"
-.if ${X11_TYPE} == "modular"
-PLIST.xwayland= yes
+# NOTYET
+#PLIST.xwayland= yes
# need update
-.include "../../wip/modular-xorg-xwayland/buildlink3.mk"
-.endif
+#.include "../../wip/xwayland/buildlink3.mk"
.include "../../devel/libudev-bsd/buildlink3.mk"
.include "../../devel/wayland/buildlink3.mk"
diff --git a/xwayland/DESCR b/xwayland/DESCR
new file mode 100644
index 0000000000..3092639c39
--- /dev/null
+++ b/xwayland/DESCR
@@ -0,0 +1,8 @@
+XWayland is a fully fledged X server implementation that acts as a proxy
+between X11 clients and a Wayland compositor.
+
+It runs as a specialized Wayland client, while optionally using a set of
+XWayland specific Wayland protocols for implementing certain functionality.
+
+The Wayland compositor acts both as the Wayland display server XWayland
+connects to, as well as the window manager.
diff --git a/xwayland/Makefile b/xwayland/Makefile
new file mode 100644
index 0000000000..bb12efd3ed
--- /dev/null
+++ b/xwayland/Makefile
@@ -0,0 +1,56 @@
+# $NetBSD: Makefile,v 1.20 2025/01/24 20:50:27 riastradh Exp $
+
+DISTNAME= xwayland-24.1.8
+CATEGORIES= x11
+MASTER_SITES= ${MASTER_SITE_XORG:=xserver/}
+EXTRACT_SUFX= .tar.xz
+
+MAINTAINER= pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE= https://xorg.freedesktop.org/
+COMMENT= Server for running X clients under Wayland from modular X.org
+LICENSE= mit AND modified-bsd AND x11 # with no-advertising clause
+
+USE_TOOLS+= pkg-config
+
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "NetBSD"
+MESON_ARGS+= -Dsecure-rpc=false
+. if ${OPSYS_VERSION} < 100000
+CPPFLAGS+= -D_OPENBSD_SOURCE # reallocarray
+. endif
+.endif
+
+.include "../../devel/wayland/platform.mk"
+
+.if empty(PLATFORM_SUPPORTS_WAYLAND:M[Yy][Ee][Ss])
+PKG_SKIP_REASON+= "Platform does not support Wayland"
+.endif
+
+post-install:
+ ${RM} ${DESTDIR}${PREFIX}/lib/xorg/protocol.txt
+ ${RM} ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/Xserver.1
+ if [ -f ${DESTDIR}${PREFIX}/share/doc/xorg-server/Xserver-DTrace.xml ]; then \
+ ${RM} ${DESTDIR}${PREFIX}/share/doc/xorg-server/Xserver-DTrace.xml; \
+ fi
+
+# New package
+.include "../../wip/input-headers/buildlink3.mk"
+
+.include "../../devel/wayland/buildlink3.mk"
+.include "../../devel/wayland-protocols/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
+.include "../../graphics/libepoxy/buildlink3.mk"
+.if ${X11_TYPE} == "modular"
+.include "../../x11/libXfont2/buildlink3.mk"
+.else
+.include "../../graphics/freetype2/buildlink3.mk"
+.endif
+.include "../../x11/libxcvt/buildlink3.mk"
+.include "../../x11/libdrm/buildlink3.mk"
+.include "../../x11/libei/buildlink3.mk"
+.include "../../x11/libxkbfile/buildlink3.mk"
+.include "../../x11/pixman/buildlink3.mk"
+.include "../../x11/xtrans/buildlink3.mk"
+.include "../../devel/meson/build.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/xwayland/PLIST b/xwayland/PLIST
new file mode 100644
index 0000000000..86cb194133
--- /dev/null
+++ b/xwayland/PLIST
@@ -0,0 +1,5 @@
+@comment $NetBSD: PLIST,v 1.2 2023/03/30 08:45:05 wiz Exp $
+bin/Xwayland
+lib/pkgconfig/xwayland.pc
+man/man1/Xwayland.1
+share/applications/org.freedesktop.Xwayland.desktop
diff --git a/xwayland/buildlink3.mk b/xwayland/buildlink3.mk
new file mode 100644
index 0000000000..01e021f85c
--- /dev/null
+++ b/xwayland/buildlink3.mk
@@ -0,0 +1,13 @@
+# $NetBSD$
+
+BUILDLINK_TREE+= xwayland
+
+.if !defined(XWAYLAND_BUILDLINK3_MK)
+XWAYLAND_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.xwayland+= xwayland>=24.1.8
+BUILDLINK_PKGSRCDIR.xwayland?= ../../wip/xwayland
+
+.endif # XWAYLAND_BUILDLINK3_MK
+
+BUILDLINK_TREE+= -xwayland
diff --git a/xwayland/distinfo b/xwayland/distinfo
new file mode 100644
index 0000000000..ff100a8a2d
--- /dev/null
+++ b/xwayland/distinfo
@@ -0,0 +1,5 @@
+$NetBSD: distinfo,v 1.1 2023/03/30 08:45:19 wiz Exp $
+
+BLAKE2s (xwayland-24.1.8.tar.xz) = acdf29ff06043260371d917bb8cc0471b13c988e7f3c86ffae734c7b22b18a41
+SHA512 (xwayland-24.1.8.tar.xz) = 417498baa87e6bfc11a778d31788a2b2d381efa08f2ac8308cfd8b1828ea62ba1da43542f798f124c25b51e8229ad1bdffc252462c0abf51be8fa0337f26d7e2
+Size (xwayland-24.1.8.tar.xz) = 1303408 bytes
Home |
Main Index |
Thread Index |
Old Index