diff options
Diffstat (limited to 'x11-base/xorg-server/xorg-server-1.19.99.904.ebuild')
| -rw-r--r-- | x11-base/xorg-server/xorg-server-1.19.99.904.ebuild | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/x11-base/xorg-server/xorg-server-1.19.99.904.ebuild b/x11-base/xorg-server/xorg-server-1.19.99.904.ebuild index 7af80e32dab9..a1dff958c171 100644 --- a/x11-base/xorg-server/xorg-server-1.19.99.904.ebuild +++ b/x11-base/xorg-server/xorg-server-1.19.99.904.ebuild @@ -4,7 +4,7 @@ EAPI=5 XORG_DOC=doc -inherit xorg-2 multilib versionator flag-o-matic +inherit autotools xorg-2 multilib versionator flag-o-matic EGIT_REPO_URI="https://anongit.freedesktop.org/git/xorg/xserver.git" DESCRIPTION="X.Org X servers" @@ -108,9 +108,10 @@ REQUIRED_USE="!minimal? ( ) xephyr? ( kdrive )" -#UPSTREAMED_PATCHES=( -# "${WORKDIR}/patches/" -#) +UPSTREAMED_PATCHES=( + "${FILESDIR}"/${P}-modesetting-Move-GBM-code-inside-ifdef-GLAMOR_HAS_GB.patch + "${FILESDIR}"/${P}-xwayland-Fix-build-without-glamor.patch +) PATCHES=( "${UPSTREAMED_PATCHES[@]}" @@ -132,6 +133,12 @@ pkg_setup() { fi } +src_prepare() { + xorg-2_src_prepare + # needed because xwayland patch touches hw/xwayland/Makefile.am + eautoreconf +} + src_configure() { # localstatedir is used for the log location; we need to override the default # from ebuild.sh |