diff options
author | Ross Burton <ross.burton@intel.com> | 2012-09-07 11:48:16 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-09-10 13:01:51 +0100 |
commit | 887a731468374c4b972ac21b488d567eadfa7609 (patch) | |
tree | 625a16c26ca5b903bc140e38f1716f747e2e8c34 /meta/recipes-graphics/xorg-xserver/xserver-xorg.inc | |
parent | 3668a2de732b61f916464e921e6b31f2552edad8 (diff) | |
download | poky-887a731468374c4b972ac21b488d567eadfa7609.tar.gz |
xserver-xorg-lite: remove
Building xserver-xorg and not installing the DRI and GLX modules (and so not
Mesa) results in an increase of 16kb compared to this package.
This isn't worth the effort of maintaining two packages.
(From OE-Core rev: 586835801a11e514a10228be957713e1ce90dd44)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/xorg-xserver/xserver-xorg.inc')
-rw-r--r-- | meta/recipes-graphics/xorg-xserver/xserver-xorg.inc | 138 |
1 files changed, 134 insertions, 4 deletions
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc index ca7d33a661..a0309aa7bb 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc | |||
@@ -1,5 +1,138 @@ | |||
1 | require xserver-xorg-common.inc | 1 | DESCRIPTION = "The X.Org X server" |
2 | HOMEPAGE = "http://www.x.org" | ||
3 | SECTION = "x11/base" | ||
4 | LICENSE = "MIT-X" | ||
5 | LIC_FILES_CHKSUM = "file://COPYING;md5=74df27b6254cc88d2799b5f4f5949c00" | ||
2 | 6 | ||
7 | # xf86-*-* packages depend on an X server built with the xfree86 DDX | ||
8 | # so we have a virtual to represent that: | ||
9 | # deprecated, we should use virtual/xserver instead | ||
10 | PROVIDES = "virtual/xserver-xf86" | ||
11 | |||
12 | # Other packages tend to just care that there is *an* X server: | ||
13 | PROVIDES += "virtual/xserver" | ||
14 | |||
15 | PE = "2" | ||
16 | |||
17 | XORG_PN = "xorg-server" | ||
18 | SRC_URI = "${XORG_MIRROR}/individual/xserver/${XORG_PN}-${PV}.tar.bz2" | ||
19 | SRC_URI += "file://macro_tweak.patch" | ||
20 | |||
21 | S = "${WORKDIR}/${XORG_PN}-${PV}" | ||
22 | |||
23 | inherit autotools pkgconfig | ||
24 | |||
25 | PROTO_DEPS = "randrproto renderproto fixesproto damageproto xextproto xproto xf86dgaproto xf86miscproto xf86rushproto xf86vidmodeproto xf86bigfontproto compositeproto recordproto resourceproto videoproto scrnsaverproto evieext trapproto xineramaproto fontsproto kbproto inputproto bigreqsproto xcmiscproto glproto" | ||
26 | LIB_DEPS = "pixman libxfont xtrans libxau libxext libxdmcp libdrm libxkbfile libpciaccess openssl" | ||
27 | DEPENDS = "${PROTO_DEPS} ${LIB_DEPS} font-util" | ||
28 | |||
29 | # Split out some modules and extensions from the main package | ||
30 | # These aren't needed for basic operations and only take up space: | ||
31 | # 32.0k libdri.so | ||
32 | # 91.0k libexa.so | ||
33 | # 336.0k libglx.so | ||
34 | # 1360k libint10.so | ||
35 | # 180.0k libwfb.so | ||
36 | # 320.0k libxaa.so | ||
37 | # 124.0k libxf1bpp.so | ||
38 | # 84.0k libxf4bpp.so | ||
39 | # librecord.so | ||
40 | # libextmod.so | ||
41 | # libdbe.so | ||
42 | |||
43 | PACKAGES =+ "${PN}-security-policy \ | ||
44 | ${PN}-sdl \ | ||
45 | ${PN}-fbdev \ | ||
46 | ${PN}-xprint \ | ||
47 | ${PN}-xvfb \ | ||
48 | ${PN}-utils \ | ||
49 | ${PN}-xephyr \ | ||
50 | ${PN}-multimedia-modules \ | ||
51 | ${PN}-extension-dri \ | ||
52 | ${PN}-extension-dri2 \ | ||
53 | ${PN}-extension-glx \ | ||
54 | ${PN}-extension-record \ | ||
55 | ${PN}-extension-extmod \ | ||
56 | ${PN}-extension-dbe \ | ||
57 | ${PN}-module-libint10 \ | ||
58 | ${PN}-module-libafb \ | ||
59 | ${PN}-module-libwfb \ | ||
60 | ${PN}-module-libmfb \ | ||
61 | ${PN}-module-libcfb \ | ||
62 | ${PN}-module-exa \ | ||
63 | ${PN}-module-xaa \ | ||
64 | ${PN}-module-libxf1bpp \ | ||
65 | ${PN}-module-libxf4bpp" | ||
66 | |||
67 | RRECOMMENDS_${PN} += "${PN}-security-policy xkeyboard-config rgb xserver-xf86-config" | ||
68 | RDEPENDS_${PN}-xvfb += "xkeyboard-config" | ||
69 | RREPLACES_${PN}-module-exa = "${PN}" | ||
70 | |||
71 | FILES_${PN} = "${bindir} ${libdir}/X11/Options ${libdir}/X11/Cards ${libdir}/X11/getconfig ${libdir}/X11/etc ${libdir}/modules/*.so ${libdir}/xorg/modules/*.so /etc/X11 ${libdir}/xorg/protocol.txt ${datadir}/X11/xorg.conf.d" | ||
72 | FILES_${PN}-dev += "${libdir}/xorg/modules/*.la ${libdir}/xorg/modules/*/*.la" | ||
73 | FILES_${PN}-doc += "${libdir}/X11/doc ${datadir}/X11/xkb/compiled/README.compiled ${localstatedir}/lib/xkb/README.compiled" | ||
74 | FILES_${PN}-dbg += "${libdir}/xorg/modules/.debug \ | ||
75 | ${libdir}/xorg/modules/*/.debug \ | ||
76 | ${libdir}/xorg/modules/*/*/.debug \ | ||
77 | " | ||
78 | FILES_${PN}-security-policy += "${libdir}/xserver/SecurityPolicy" | ||
79 | FILES_${PN}-sdl = "${bindir}/Xsdl" | ||
80 | FILES_${PN}-fbdev = "${bindir}/Xfbdev" | ||
81 | FILES_${PN}-xprint = "${libdir}/X11/xserver/*/print" | ||
82 | FILES_${PN}-xvfb = "${bindir}/Xvfb" | ||
83 | FILES_${PN}-utils = "${bindir}/scanpci ${bindir}/pcitweak ${bindir}/ioport ${bindir}/in[bwl] ${bindir}/out[bwl] ${bindir}/mmap[rw] ${bindir}/gtf ${bindir}/getconfig ${bindir}/getconfig.pl" | ||
84 | FILES_${PN}-xephyr = "${bindir}/Xephyr" | ||
85 | FILES_${PN}-multimedia-modules = "${libdir}/xorg/modules/multimedia/*drv*" | ||
86 | FILES_${PN}-extension-dri = "${libdir}/xorg/modules/extensions/libdri.so" | ||
87 | FILES_${PN}-extension-dri2 = "${libdir}/xorg/modules/extensions/libdri2.so" | ||
88 | FILES_${PN}-extension-glx = "${libdir}/xorg/modules/extensions/libglx.so" | ||
89 | FILES_${PN}-extension-record = "${libdir}/xorg/modules/extensions/librecord.so" | ||
90 | FILES_${PN}-extension-extmod = "${libdir}/xorg/modules/extensions/libextmod.so" | ||
91 | FILES_${PN}-extension-dbe = "${libdir}/xorg/modules/extensions/libdbe.so" | ||
92 | FILES_${PN}-module-libint10 = "${libdir}/xorg/modules/libint10.so" | ||
93 | FILES_${PN}-module-libafb = "${libdir}/xorg/modules/libafb.so" | ||
94 | FILES_${PN}-module-libwfb = "${libdir}/xorg/modules/libwfb.so" | ||
95 | FILES_${PN}-module-libmfb = "${libdir}/xorg/modules/libmfb.so" | ||
96 | FILES_${PN}-module-libcfb = "${libdir}/xorg/modules/libcfb.so" | ||
97 | FILES_${PN}-module-exa = "${libdir}/xorg/modules/libexa.so" | ||
98 | FILES_${PN}-module-xaa = "${libdir}/xorg/modules/libxaa.so" | ||
99 | FILES_${PN}-module-libxf1bpp = "${libdir}/xorg/modules/libxf1bpp.so" | ||
100 | FILES_${PN}-module-libxf4bpp = "${libdir}/xorg/modules/libxf4bpp.so" | ||
101 | |||
102 | EXTRA_OECONF += "--with-fop=no \ | ||
103 | --without-xmlto \ | ||
104 | --with-pic \ | ||
105 | --disable-static \ | ||
106 | --disable-acfb \ | ||
107 | --disable-ccfb \ | ||
108 | --disable-mcfb \ | ||
109 | --disable-xinerama \ | ||
110 | --disable-xf86misc \ | ||
111 | --disable-xorgcfg \ | ||
112 | --disable-record \ | ||
113 | --disable-dmx \ | ||
114 | --disable-xnest \ | ||
115 | --disable-xvfb \ | ||
116 | --enable-composite \ | ||
117 | --without-dtrace \ | ||
118 | --with-int10=x86emu \ | ||
119 | --sysconfdir=/etc/X11 \ | ||
120 | --localstatedir=/var \ | ||
121 | --with-fontdir=${datadir}/fonts/X11 \ | ||
122 | --with-xkb-output=/var/lib/xkb \ | ||
123 | ac_cv_file__usr_share_sgml_X11_defs_ent=no \ | ||
124 | " | ||
125 | |||
126 | PACKAGECONFIG ??= "udev" | ||
127 | PACKAGECONFIG[udev] = "--enable-config-udev,--disable-config-udev,udev" | ||
128 | |||
129 | do_install_append () { | ||
130 | # Its assumed base-files creates this for us | ||
131 | rmdir ${D}${localstatedir}/log/ | ||
132 | } | ||
133 | |||
134 | |||
135 | # Mesa/GLX/DRI | ||
3 | PROTO_DEPS += "xf86driproto dri2proto" | 136 | PROTO_DEPS += "xf86driproto dri2proto" |
4 | LIB_DEPS += "mesa-dri" | 137 | LIB_DEPS += "mesa-dri" |
5 | 138 | ||
@@ -7,7 +140,4 @@ EXTRA_OECONF += "\ | |||
7 | --enable-dri \ | 140 | --enable-dri \ |
8 | --enable-dri2 \ | 141 | --enable-dri2 \ |
9 | --enable-glx-tls \ | 142 | --enable-glx-tls \ |
10 | --with-pic \ | ||
11 | --with-int10=x86emu \ | ||
12 | --without-xmlto \ | ||
13 | " | 143 | " |