---
Just an example of the changes needed to port from xorg-3 to xorg-meson.
Not to actually land -- ebuilds would either be converted during a
version bump or with a revbump.
media-fonts/encodings/encodings-1.1.0.ebuild | 11 +++--------
x11-apps/xisxwayland/xisxwayland-2.ebuild | 9 ++-------
x11-apps/xisxwayland/xisxwayland-9999.ebuild | 9 ++-------
x11-base/xorg-server/xorg-server-21.1.16.ebuild | 15 +++++++--------
x11-base/xorg-server/xorg-server-9999.ebuild | 17 ++++++++---------
.../xf86-input-wacom-1.2.3.ebuild | 8 ++++----
x11-libs/libXau/libXau-1.0.12.ebuild | 2 +-
x11-libs/libXft/libXft-2.3.9.ebuild | 2 +-
x11-libs/libXvMC/libXvMC-1.0.14.ebuild | 16 ++--------------
.../libpciaccess/libpciaccess-0.18.1.ebuild | 14 +++++---------
x11-libs/libxcvt/libxcvt-0.1.3.ebuild | 7 +------
x11-libs/libxcvt/libxcvt-9999.ebuild | 9 ++-------
x11-misc/rendercheck/rendercheck-1.6.ebuild | 10 ++--------
x11-misc/rendercheck/rendercheck-9999.ebuild | 10 ++--------
14 files changed, 42 insertions(+), 97 deletions(-)
diff --git ./media-fonts/encodings/encodings-1.1.0.ebuild
./media-fonts/encodings/encodings-1.1.0.ebuild
index d27332421526..8a0621336af1 100644
--- ./media-fonts/encodings/encodings-1.1.0.ebuild
+++ ./media-fonts/encodings/encodings-1.1.0.ebuild
@@ -5,7 +5,7 @@ EAPI=8
# font eclass is inherited directly, since this package is a special case that
# would greatly complicate the fonts logic of xorg-3
-inherit font xorg-3 meson
+inherit font xorg-meson
DESCRIPTION="X.Org font encodings"
@@ -13,14 +13,9 @@ KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc
ppc64 ~riscv ~s390
BDEPEND="x11-apps/mkfontscale"
-# Override xorg-3's src_prepare
-src_prepare() {
- default
-}
-
src_configure() {
- local emesonargs=(
+ local XORG_CONFIGURE_OPTIONS=(
-Dfontrootdir="${EPREFIX}"/usr/share/fonts
)
- meson_src_configure
+ xorg-meson_src_configure
}
diff --git ./x11-apps/xisxwayland/xisxwayland-2.ebuild
./x11-apps/xisxwayland/xisxwayland-2.ebuild
index 2c8b87718a37..9397aff453f3 100644
--- ./x11-apps/xisxwayland/xisxwayland-2.ebuild
+++ ./x11-apps/xisxwayland/xisxwayland-2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2020-2024 Gentoo Authors
+# Copyright 2020-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-inherit xorg-3 meson
+inherit xorg-meson
if [[ ${PV} != *9999* ]]; then
KEYWORDS="amd64 ~loong"
@@ -16,8 +16,3 @@ RDEPEND="
x11-libs/libXrandr"
DEPEND="${RDEPEND}
x11-base/xorg-proto"
-
-# Override xorg-3's src_prepare
-src_prepare() {
- default
-}
diff --git ./x11-apps/xisxwayland/xisxwayland-9999.ebuild
./x11-apps/xisxwayland/xisxwayland-9999.ebuild
index 2c8b87718a37..9397aff453f3 100644
--- ./x11-apps/xisxwayland/xisxwayland-9999.ebuild
+++ ./x11-apps/xisxwayland/xisxwayland-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2020-2024 Gentoo Authors
+# Copyright 2020-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-inherit xorg-3 meson
+inherit xorg-meson
if [[ ${PV} != *9999* ]]; then
KEYWORDS="amd64 ~loong"
@@ -16,8 +16,3 @@ RDEPEND="
x11-libs/libXrandr"
DEPEND="${RDEPEND}
x11-base/xorg-proto"
-
-# Override xorg-3's src_prepare
-src_prepare() {
- default
-}
diff --git ./x11-base/xorg-server/xorg-server-21.1.16.ebuild
./x11-base/xorg-server/xorg-server-21.1.16.ebuild
index 3c1ae3e1c2be..d65ca93e7aa7 100644
--- ./x11-base/xorg-server/xorg-server-21.1.16.ebuild
+++ ./x11-base/xorg-server/xorg-server-21.1.16.ebuild
@@ -3,8 +3,7 @@
EAPI=8
-XORG_EAUTORECONF="no"
-inherit flag-o-matic xorg-3 meson
+inherit flag-o-matic xorg-meson
EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/xserver.git";
DESCRIPTION="X.Org X servers"
@@ -113,7 +112,7 @@ src_configure() {
# localstatedir is used for the log location; we need to override the
default
# from ebuild.sh
# sysconfdir is used for the xorg.conf location; same applies
- local emesonargs=(
+ local XORG_CONFIGURE_OPTIONS=(
--localstatedir "${EPREFIX}/var"
--sysconfdir "${EPREFIX}/etc/X11"
-Dbuildtype=$(usex debug debug plain)
@@ -146,26 +145,26 @@ src_configure() {
if [[ ${PV} == 9999 ]] ; then
# Gone in 21.1.x, but not in master.
- emesonargs+=( -Dxwayland=false )
+ XORG_CONFIGURE_OPTIONS+=( -Dxwayland=false )
fi
if use systemd || use elogind; then
- emesonargs+=(
+ XORG_CONFIGURE_OPTIONS+=(
-Dsystemd_logind=true
$(meson_use suid suid_wrapper)
)
else
- emesonargs+=(
+ XORG_CONFIGURE_OPTIONS+=(
-Dsystemd_logind=false
-Dsuid_wrapper=false
)
fi
- meson_src_configure
+ xorg-meson_src_configure
}
src_install() {
- meson_src_install
+ xorg-meson_src_install
# The meson build system does not support install-setuid
if ! use systemd && ! use elogind; then
diff --git ./x11-base/xorg-server/xorg-server-9999.ebuild
./x11-base/xorg-server/xorg-server-9999.ebuild
index b5b0e5a96c8e..a95ac63e8f27 100644
--- ./x11-base/xorg-server/xorg-server-9999.ebuild
+++ ./x11-base/xorg-server/xorg-server-9999.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-XORG_EAUTORECONF="no"
-inherit flag-o-matic xorg-3 meson
+inherit flag-o-matic xorg-meson
EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/xserver.git";
DESCRIPTION="X.Org X servers"
@@ -110,7 +109,7 @@ src_configure() {
# localstatedir is used for the log location; we need to override the
default
# from ebuild.sh
# sysconfdir is used for the xorg.conf location; same applies
- local emesonargs=(
+ local XORG_CONFIGURE_OPTIONS=(
--localstatedir "${EPREFIX}/var"
--sysconfdir "${EPREFIX}/etc/X11"
-Db_ndebug=$(usex debug false true)
@@ -141,26 +140,26 @@ src_configure() {
if [[ ${PV} == 9999 ]] ; then
# Gone in 21.1.x, but not in master.
- emesonargs+=( -Dxwayland=false )
+ XORG_CONFIGURE_OPTIONS+=( -Dxwayland=false )
fi
if use systemd || use elogind; then
- emesonargs+=(
+ XORG_CONFIGURE_OPTIONS+=(
-Dsystemd_logind=true
$(meson_use suid suid_wrapper)
)
else
- emesonargs+=(
+ XORG_CONFIGURE_OPTIONS+=(
-Dsystemd_logind=false
-Dsuid_wrapper=false
)
fi
- meson_src_configure
+ xorg-meson_src_configure
}
src_install() {
- meson_src_install
+ xorg-meson_src_install
# The meson build system does not support install-setuid
if ! use systemd && ! use elogind; then
diff --git ./x11-drivers/xf86-input-wacom/xf86-input-wacom-1.2.3.ebuild
./x11-drivers/xf86-input-wacom/xf86-input-wacom-1.2.3.ebuild
index 8d3e38056e6b..b7e5033ae432 100644
--- ./x11-drivers/xf86-input-wacom/xf86-input-wacom-1.2.3.ebuild
+++ ./x11-drivers/xf86-input-wacom/xf86-input-wacom-1.2.3.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-inherit linux-info systemd udev xorg-3 meson
+inherit linux-info systemd udev xorg-meson
DESCRIPTION="Driver for Wacom tablets and drawing devices"
HOMEPAGE="https://linuxwacom.github.io/";
@@ -43,15 +43,15 @@ pkg_setup() {
}
src_configure() {
- xorg-3_flags_setup
+ xorg-meson_flags_setup
- local emesonargs=(
+ local XORG_CONFIGURE_OPTIONS=(
-Dsystemd-unit-dir="$(systemd_get_systemunitdir)"
-Dudev-rules-dir="$(get_udevdir)/rules.d"
$(meson_feature test unittests)
-Dwacom-gobject=disabled
)
- meson_src_configure
+ xorg-meson_src_configure
}
pkg_postinst() {
diff --git ./x11-libs/libXau/libXau-1.0.12.ebuild
./x11-libs/libXau/libXau-1.0.12.ebuild
index 4555e7fcb0bd..b33a04d4eb73 100644
--- ./x11-libs/libXau/libXau-1.0.12.ebuild
+++ ./x11-libs/libXau/libXau-1.0.12.ebuild
@@ -5,7 +5,7 @@ EAPI=8
XORG_DOC=doc
XORG_MULTILIB=yes
-inherit xorg-3
+inherit xorg-meson
DESCRIPTION="X.Org X authorization library"
diff --git ./x11-libs/libXft/libXft-2.3.9.ebuild
./x11-libs/libXft/libXft-2.3.9.ebuild
index dd60251365ba..8120ef341ae2 100644
--- ./x11-libs/libXft/libXft-2.3.9.ebuild
+++ ./x11-libs/libXft/libXft-2.3.9.ebuild
@@ -4,7 +4,7 @@
EAPI=8
XORG_MULTILIB=yes
-inherit xorg-3
+inherit xorg-meson
DESCRIPTION="X.Org Xft library"
diff --git ./x11-libs/libXvMC/libXvMC-1.0.14.ebuild
./x11-libs/libXvMC/libXvMC-1.0.14.ebuild
index 93430e9de52b..dfd43c3d2a46 100644
--- ./x11-libs/libXvMC/libXvMC-1.0.14.ebuild
+++ ./x11-libs/libXvMC/libXvMC-1.0.14.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
XORG_MULTILIB=yes
-inherit xorg-3 meson-multilib
+inherit xorg-meson
DESCRIPTION="X.Org XvMC library"
@@ -18,18 +18,6 @@ RDEPEND="
DEPEND="${RDEPEND}
x11-base/xorg-proto"
-# Override xorg-3's src_prepare
-src_prepare() {
- default
-}
-
-multilib_src_configure() {
- local emesonargs=(
- -Ddefault_library=shared
- )
- meson_src_configure
-}
-
multilib_src_install_all() {
einstalldocs
mv "${ED}"/usr/share/doc/{${PN},${P}}/XvMC_API.txt || die
diff --git ./x11-libs/libpciaccess/libpciaccess-0.18.1.ebuild
./x11-libs/libpciaccess/libpciaccess-0.18.1.ebuild
index b698148f8e09..da00c618c892 100644
--- ./x11-libs/libpciaccess/libpciaccess-0.18.1.ebuild
+++ ./x11-libs/libpciaccess/libpciaccess-0.18.1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
XORG_MULTILIB=yes
-inherit xorg-3 meson-multilib
+inherit xorg-meson
DESCRIPTION="Library providing generic access to the PCI bus and devices"
KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv
~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
@@ -15,14 +15,10 @@ DEPEND="
RDEPEND="${DEPEND}
sys-apps/hwdata"
-src_prepare() {
- default
-}
-
-multilib_src_configure() {
- local emesonargs=(
+src_configure() {
+ local XORG_CONFIGURE_OPTIONS=(
-Dpci-ids="${EPREFIX}"/usr/share/hwdata
$(meson_feature zlib)
)
- meson_src_configure
+ xorg-meson_src_configure
}
diff --git ./x11-libs/libxcvt/libxcvt-0.1.3.ebuild
./x11-libs/libxcvt/libxcvt-0.1.3.ebuild
index 426847c19cfe..a2f7cf41dc3e 100644
--- ./x11-libs/libxcvt/libxcvt-0.1.3.ebuild
+++ ./x11-libs/libxcvt/libxcvt-0.1.3.ebuild
@@ -3,15 +3,10 @@
EAPI=8
-inherit xorg-3 meson
+inherit xorg-meson
if [[ ${PV} != *9999* ]]; then
KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64
~riscv ~s390 sparc x86"
fi
DESCRIPTION="X.Org xcvt library and cvt program"
-
-# Override xorg-3's src_prepare
-src_prepare() {
- default
-}
diff --git ./x11-libs/libxcvt/libxcvt-9999.ebuild
./x11-libs/libxcvt/libxcvt-9999.ebuild
index 1653d2ad10a4..e84c7c548fb6 100644
--- ./x11-libs/libxcvt/libxcvt-9999.ebuild
+++ ./x11-libs/libxcvt/libxcvt-9999.ebuild
@@ -1,17 +1,12 @@
-# Copyright 2021-2024 Gentoo Authors
+# Copyright 2021-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-inherit xorg-3 meson
+inherit xorg-meson
if [[ ${PV} != *9999* ]]; then
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc
~ppc64 ~riscv ~s390 ~sparc ~x86"
fi
DESCRIPTION="X.Org xcvt library and cvt program"
-
-# Override xorg-3's src_prepare
-src_prepare() {
- default
-}
diff --git ./x11-misc/rendercheck/rendercheck-1.6.ebuild
./x11-misc/rendercheck/rendercheck-1.6.ebuild
index 9d5943e0a598..e6a837f1420e 100644
--- ./x11-misc/rendercheck/rendercheck-1.6.ebuild
+++ ./x11-misc/rendercheck/rendercheck-1.6.ebuild
@@ -1,10 +1,10 @@
-# Copyright 2024 Gentoo Authors
+# Copyright 2024-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
XORG_MODULE=test/
-inherit xorg-3 meson
+inherit xorg-meson
if [[ ${PV} != *9999* ]]; then
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64
~riscv ~s390 ~sparc x86"
@@ -23,9 +23,3 @@ DEPEND="
${RDEPEND}
x11-base/xorg-proto
"
-BDEPEND="virtual/pkgconfig"
-
-# Override xorg-3's src_prepare
-src_prepare() {
- default
-}
diff --git ./x11-misc/rendercheck/rendercheck-9999.ebuild
./x11-misc/rendercheck/rendercheck-9999.ebuild
index c9265373ea8b..44c0cf2573c5 100644
--- ./x11-misc/rendercheck/rendercheck-9999.ebuild
+++ ./x11-misc/rendercheck/rendercheck-9999.ebuild
@@ -1,10 +1,10 @@
-# Copyright 2024 Gentoo Authors
+# Copyright 2024-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
XORG_MODULE=test/
-inherit xorg-3 meson
+inherit xorg-meson
if [[ ${PV} != *9999* ]]; then
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc
~ppc64 ~riscv ~s390 ~sparc ~x86"
@@ -23,9 +23,3 @@ DEPEND="
${RDEPEND}
x11-base/xorg-proto
"
-BDEPEND="virtual/pkgconfig"
-
-# Override xorg-3's src_prepare
-src_prepare() {
- default
-}
--
2.49.0
