summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc21
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xorg-lite.inc20
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xorg.inc22
3 files changed, 26 insertions, 37 deletions
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
index 77c37613b5..0cc3dc0df2 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
@@ -94,7 +94,26 @@ FILES_${PN}-module-xaa = "${libdir}/xorg/modules/libxaa.so"
94FILES_${PN}-module-libxf1bpp = "${libdir}/xorg/modules/libxf1bpp.so" 94FILES_${PN}-module-libxf1bpp = "${libdir}/xorg/modules/libxf1bpp.so"
95FILES_${PN}-module-libxf4bpp = "${libdir}/xorg/modules/libxf4bpp.so" 95FILES_${PN}-module-libxf4bpp = "${libdir}/xorg/modules/libxf4bpp.so"
96 96
97EXTRA_OECONF = "--with-fop=no" 97EXTRA_OECONF += "--with-fop=no \
98 --disable-static \
99 --disable-acfb \
100 --disable-ccfb \
101 --disable-mcfb \
102 --disable-dga \
103 --disable-xinerama \
104 --disable-xf86misc \
105 --disable-xorgcfg \
106 --disable-record \
107 --disable-dmx \
108 --disable-xnest \
109 --disable-xvfb \
110 --enable-composite \
111 --sysconfdir=/etc/X11 \
112 --localstatedir=/var \
113 --with-fontdir=${datadir}/fonts/X11 \
114 --with-xkb-output=/var/lib/xkb \
115 ac_cv_file__usr_share_sgml_X11_defs_ent=no \
116"
98 117
99PACKAGECONFIG ??= "udev" 118PACKAGECONFIG ??= "udev"
100PACKAGECONFIG[hal] = "--enable-config-hal,--disable-config-hal,,hal" 119PACKAGECONFIG[hal] = "--enable-config-hal,--disable-config-hal,,hal"
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite.inc
index b82d1532b0..be84e9e3f7 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite.inc
@@ -1,22 +1,6 @@
1require xserver-xorg-common.inc 1require xserver-xorg-common.inc
2 2
3EXTRA_OECONF += "--disable-static \ 3EXTRA_OECONF += "\
4 --disable-acfb \
5 --disable-ccfb \
6 --disable-mcfb \
7 --disable-dga \
8 --disable-xinerama \
9 --disable-xf86misc \
10 --disable-xorgcfg \
11 --disable-record \
12 --disable-dmx \
13 --disable-xnest \
14 --disable-xvfb \
15 --enable-composite \
16 --disable-dri \ 4 --disable-dri \
17 --disable-glx \ 5 --disable-glx \
18 --sysconfdir=/etc/X11 \ 6"
19 --localstatedir=/var \
20 --with-fontdir=${datadir}/fonts/X11 \
21 --with-xkb-output=/var/lib/xkb \
22 ac_cv_file__usr_share_sgml_X11_defs_ent=no"
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
index 726fbaa35e..f7348738ea 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
@@ -5,26 +5,12 @@ LIB_DEPS += "virtual/libgl"
5 5
6require ../mesa/glx-use-tls.inc 6require ../mesa/glx-use-tls.inc
7 7
8EXTRA_OECONF += "--disable-static \ 8EXTRA_OECONF += "\
9 --disable-acfb \ 9 --enable-dri \
10 --disable-ccfb \ 10 --enable-dri2 \
11 --disable-mcfb \
12 --disable-dga \
13 --disable-xinerama \
14 --disable-xf86misc \
15 --disable-xorgcfg \
16 --disable-record \
17 --disable-dmx \
18 --disable-xnest \
19 --disable-xvfb \
20 --enable-composite \
21 --sysconfdir=/etc/X11 \
22 --localstatedir=/var \
23 --with-pic \ 11 --with-pic \
24 --with-int10=x86emu \ 12 --with-int10=x86emu \
25 --with-fontdir=${datadir}/fonts/X11 \ 13"
26 --with-xkb-output=/var/lib/xkb \
27 ac_cv_file__usr_share_sgml_X11_defs_ent=no"
28 14
29# Due to mesa-dri 15# Due to mesa-dri
30COMPATIBLE_HOST = '(i.86.*-linux|x86_64.*-linux)' 16COMPATIBLE_HOST = '(i.86.*-linux|x86_64.*-linux)'