diff options
Diffstat (limited to 'meta/recipes-graphics/xorg-xserver/xserver-xorg.inc')
-rw-r--r-- | meta/recipes-graphics/xorg-xserver/xserver-xorg.inc | 32 |
1 files changed, 20 insertions, 12 deletions
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc index 33564eb66e..4135a8b4cf 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc | |||
@@ -2,7 +2,7 @@ DESCRIPTION = "The X.Org X server" | |||
2 | HOMEPAGE = "http://www.x.org" | 2 | HOMEPAGE = "http://www.x.org" |
3 | SECTION = "x11/base" | 3 | SECTION = "x11/base" |
4 | LICENSE = "MIT-X" | 4 | LICENSE = "MIT-X" |
5 | LIC_FILES_CHKSUM = "file://COPYING;md5=74df27b6254cc88d2799b5f4f5949c00" | 5 | LIC_FILES_CHKSUM = "file://COPYING;md5=bc098b9774ed096943f6c37b5beeef13" |
6 | 6 | ||
7 | # xf86-*-* packages depend on an X server built with the xfree86 DDX | 7 | # xf86-*-* packages depend on an X server built with the xfree86 DDX |
8 | # so we have a virtual to represent that: | 8 | # so we have a virtual to represent that: |
@@ -13,7 +13,7 @@ PROVIDES = "virtual/xserver-xf86" | |||
13 | PROVIDES += "virtual/xserver" | 13 | PROVIDES += "virtual/xserver" |
14 | 14 | ||
15 | PE = "2" | 15 | PE = "2" |
16 | INC_PR = "r3" | 16 | INC_PR = "r5" |
17 | 17 | ||
18 | XORG_PN = "xorg-server" | 18 | XORG_PN = "xorg-server" |
19 | SRC_URI = "${XORG_MIRROR}/individual/xserver/${XORG_PN}-${PV}.tar.bz2" | 19 | SRC_URI = "${XORG_MIRROR}/individual/xserver/${XORG_PN}-${PV}.tar.bz2" |
@@ -48,12 +48,7 @@ PACKAGES =+ "${PN}-security-policy \ | |||
48 | ${PN}-utils \ | 48 | ${PN}-utils \ |
49 | ${PN}-xephyr \ | 49 | ${PN}-xephyr \ |
50 | ${PN}-multimedia-modules \ | 50 | ${PN}-multimedia-modules \ |
51 | ${PN}-extension-dri \ | ||
52 | ${PN}-extension-dri2 \ | ||
53 | ${PN}-extension-glx \ | 51 | ${PN}-extension-glx \ |
54 | ${PN}-extension-record \ | ||
55 | ${PN}-extension-extmod \ | ||
56 | ${PN}-extension-dbe \ | ||
57 | ${PN}-module-libint10 \ | 52 | ${PN}-module-libint10 \ |
58 | ${PN}-module-libafb \ | 53 | ${PN}-module-libafb \ |
59 | ${PN}-module-libwfb \ | 54 | ${PN}-module-libwfb \ |
@@ -67,6 +62,24 @@ PACKAGES =+ "${PN}-security-policy \ | |||
67 | RRECOMMENDS_${PN} += "${PN}-security-policy xkeyboard-config rgb xserver-xf86-config" | 62 | RRECOMMENDS_${PN} += "${PN}-security-policy xkeyboard-config rgb xserver-xf86-config" |
68 | RDEPENDS_${PN}-xvfb += "xkeyboard-config" | 63 | RDEPENDS_${PN}-xvfb += "xkeyboard-config" |
69 | RDEPENDS_${PN}-module-exa = "${PN} (= ${EXTENDPKGV})" | 64 | RDEPENDS_${PN}-module-exa = "${PN} (= ${EXTENDPKGV})" |
65 | RREPLACES_${PN} = "${PN}-extension-dri \ | ||
66 | ${PN}-extension-dri2 \ | ||
67 | ${PN}-extension-record \ | ||
68 | ${PN}-extension-extmod \ | ||
69 | ${PN}-extension-dbe \ | ||
70 | " | ||
71 | RPROVIDES_${PN} = "${PN}-extension-dri \ | ||
72 | ${PN}-extension-dri2 \ | ||
73 | ${PN}-extension-record \ | ||
74 | ${PN}-extension-extmod \ | ||
75 | ${PN}-extension-dbe \ | ||
76 | " | ||
77 | RCONFLICTS_${PN} = "${PN}-extension-dri \ | ||
78 | ${PN}-extension-dri2 \ | ||
79 | ${PN}-extension-record \ | ||
80 | ${PN}-extension-extmod \ | ||
81 | ${PN}-extension-dbe \ | ||
82 | " | ||
70 | 83 | ||
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" | 84 | 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" | 85 | FILES_${PN}-dev += "${libdir}/xorg/modules/*.la ${libdir}/xorg/modules/*/*.la" |
@@ -82,12 +95,7 @@ FILES_${PN}-xvfb = "${bindir}/Xvfb" | |||
82 | 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" | 95 | 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" |
83 | FILES_${PN}-xephyr = "${bindir}/Xephyr" | 96 | FILES_${PN}-xephyr = "${bindir}/Xephyr" |
84 | FILES_${PN}-multimedia-modules = "${libdir}/xorg/modules/multimedia/*drv*" | 97 | FILES_${PN}-multimedia-modules = "${libdir}/xorg/modules/multimedia/*drv*" |
85 | FILES_${PN}-extension-dri = "${libdir}/xorg/modules/extensions/libdri.so" | ||
86 | FILES_${PN}-extension-dri2 = "${libdir}/xorg/modules/extensions/libdri2.so" | ||
87 | FILES_${PN}-extension-glx = "${libdir}/xorg/modules/extensions/libglx.so" | 98 | FILES_${PN}-extension-glx = "${libdir}/xorg/modules/extensions/libglx.so" |
88 | FILES_${PN}-extension-record = "${libdir}/xorg/modules/extensions/librecord.so" | ||
89 | FILES_${PN}-extension-extmod = "${libdir}/xorg/modules/extensions/libextmod.so" | ||
90 | FILES_${PN}-extension-dbe = "${libdir}/xorg/modules/extensions/libdbe.so" | ||
91 | FILES_${PN}-module-libint10 = "${libdir}/xorg/modules/libint10.so" | 99 | FILES_${PN}-module-libint10 = "${libdir}/xorg/modules/libint10.so" |
92 | FILES_${PN}-module-libafb = "${libdir}/xorg/modules/libafb.so" | 100 | FILES_${PN}-module-libafb = "${libdir}/xorg/modules/libafb.so" |
93 | FILES_${PN}-module-libwfb = "${libdir}/xorg/modules/libwfb.so" | 101 | FILES_${PN}-module-libwfb = "${libdir}/xorg/modules/libwfb.so" |