Patchwork [5/5] xserver: remove unrecognised options

login
register
mail settings
Submitter Ross Burton
Date Dec. 4, 2013, 3:35 p.m.
Message ID <1386171342-7213-5-git-send-email-ross.burton@intel.com>
Download mbox | patch
Permalink /patch/62825/
State Accepted
Commit 472e6c48cf259ec6ac99c108b73ee3135493d8d1
Headers show

Comments

Ross Burton - Dec. 4, 2013, 3:35 p.m.
--disable-xorgcfg was removed in 2008.

--with-fontdir was renamed to --with-fontrootdir in 2009 and the default value
is good.

--disable-xf86misc was removed in 2008.

--disable-acfb, -ccfb and -mcfb should have been --disable-afb, -cfb, -mfb, and
were removed in 2008.

Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 meta/recipes-graphics/xorg-xserver/xserver-xorg.inc |    6 ------
 1 file changed, 6 deletions(-)

Patch

diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
index 969b84e..ebfb814 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
@@ -102,12 +102,7 @@  EXTRA_OECONF += "--with-fop=no \
                  --without-xmlto \
                  --with-pic \
                  --disable-static \
-                 --disable-acfb \
-                 --disable-ccfb \
-                 --disable-mcfb \
                  --disable-xinerama \
-                 --disable-xf86misc \
-                 --disable-xorgcfg \
                  --disable-record \
                  --disable-dmx \
                  --disable-xnest \
@@ -117,7 +112,6 @@  EXTRA_OECONF += "--with-fop=no \
                  --with-int10=x86emu \
                  --sysconfdir=/etc/X11 \
                  --localstatedir=/var \
-                 --with-fontdir=${datadir}/fonts/X11 \
                  --with-xkb-output=/var/lib/xkb \
                  ac_cv_file__usr_share_sgml_X11_defs_ent=no \
 "