summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-graphics')
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xorg.inc30
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xorg_1.13.0.bb22
2 files changed, 33 insertions, 19 deletions
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
index d410707363..cea4c26cc7 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
@@ -13,7 +13,7 @@ PROVIDES = "virtual/xserver-xf86"
13PROVIDES += "virtual/xserver" 13PROVIDES += "virtual/xserver"
14 14
15PE = "2" 15PE = "2"
16INC_PR = "r6" 16INC_PR = "r7"
17 17
18XORG_PN = "xorg-server" 18XORG_PN = "xorg-server"
19SRC_URI = "${XORG_MIRROR}/individual/xserver/${XORG_PN}-${PV}.tar.bz2" 19SRC_URI = "${XORG_MIRROR}/individual/xserver/${XORG_PN}-${PV}.tar.bz2"
@@ -48,7 +48,12 @@ 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 \
51 ${PN}-extension-glx \ 53 ${PN}-extension-glx \
54 ${PN}-extension-record \
55 ${PN}-extension-extmod \
56 ${PN}-extension-dbe \
52 ${PN}-module-libint10 \ 57 ${PN}-module-libint10 \
53 ${PN}-module-libafb \ 58 ${PN}-module-libafb \
54 ${PN}-module-libwfb \ 59 ${PN}-module-libwfb \
@@ -62,24 +67,6 @@ PACKAGES =+ "${PN}-security-policy \
62RRECOMMENDS_${PN} += "${PN}-security-policy xkeyboard-config rgb xserver-xf86-config" 67RRECOMMENDS_${PN} += "${PN}-security-policy xkeyboard-config rgb xserver-xf86-config"
63RDEPENDS_${PN}-xvfb += "xkeyboard-config" 68RDEPENDS_${PN}-xvfb += "xkeyboard-config"
64RDEPENDS_${PN}-module-exa = "${PN} (= ${EXTENDPKGV})" 69RDEPENDS_${PN}-module-exa = "${PN} (= ${EXTENDPKGV})"
65RREPLACES_${PN} = "${PN}-extension-dri \
66 ${PN}-extension-dri2 \
67 ${PN}-extension-record \
68 ${PN}-extension-extmod \
69 ${PN}-extension-dbe \
70 "
71RPROVIDES_${PN} = "${PN}-extension-dri \
72 ${PN}-extension-dri2 \
73 ${PN}-extension-record \
74 ${PN}-extension-extmod \
75 ${PN}-extension-dbe \
76 "
77RCONFLICTS_${PN} = "${PN}-extension-dri \
78 ${PN}-extension-dri2 \
79 ${PN}-extension-record \
80 ${PN}-extension-extmod \
81 ${PN}-extension-dbe \
82 "
83 70
84FILES_${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" 71FILES_${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"
85FILES_${PN}-dev += "${libdir}/xorg/modules/*.la ${libdir}/xorg/modules/*/*.la" 72FILES_${PN}-dev += "${libdir}/xorg/modules/*.la ${libdir}/xorg/modules/*/*.la"
@@ -95,7 +82,12 @@ FILES_${PN}-xvfb = "${bindir}/Xvfb"
95FILES_${PN}-utils = "${bindir}/scanpci ${bindir}/pcitweak ${bindir}/ioport ${bindir}/in[bwl] ${bindir}/out[bwl] ${bindir}/mmap[rw] ${bindir}/gtf ${bindir}/getconfig ${bindir}/getconfig.pl" 82FILES_${PN}-utils = "${bindir}/scanpci ${bindir}/pcitweak ${bindir}/ioport ${bindir}/in[bwl] ${bindir}/out[bwl] ${bindir}/mmap[rw] ${bindir}/gtf ${bindir}/getconfig ${bindir}/getconfig.pl"
96FILES_${PN}-xephyr = "${bindir}/Xephyr" 83FILES_${PN}-xephyr = "${bindir}/Xephyr"
97FILES_${PN}-multimedia-modules = "${libdir}/xorg/modules/multimedia/*drv*" 84FILES_${PN}-multimedia-modules = "${libdir}/xorg/modules/multimedia/*drv*"
85FILES_${PN}-extension-dri = "${libdir}/xorg/modules/extensions/libdri.so"
86FILES_${PN}-extension-dri2 = "${libdir}/xorg/modules/extensions/libdri2.so"
98FILES_${PN}-extension-glx = "${libdir}/xorg/modules/extensions/libglx.so" 87FILES_${PN}-extension-glx = "${libdir}/xorg/modules/extensions/libglx.so"
88FILES_${PN}-extension-record = "${libdir}/xorg/modules/extensions/librecord.so"
89FILES_${PN}-extension-extmod = "${libdir}/xorg/modules/extensions/libextmod.so"
90FILES_${PN}-extension-dbe = "${libdir}/xorg/modules/extensions/libdbe.so"
99FILES_${PN}-module-libint10 = "${libdir}/xorg/modules/libint10.so" 91FILES_${PN}-module-libint10 = "${libdir}/xorg/modules/libint10.so"
100FILES_${PN}-module-libafb = "${libdir}/xorg/modules/libafb.so" 92FILES_${PN}-module-libafb = "${libdir}/xorg/modules/libafb.so"
101FILES_${PN}-module-libwfb = "${libdir}/xorg/modules/libwfb.so" 93FILES_${PN}-module-libwfb = "${libdir}/xorg/modules/libwfb.so"
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.13.0.bb b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.13.0.bb
index 8ad87b862a..3b102cb71e 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.13.0.bb
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.13.0.bb
@@ -10,3 +10,25 @@ SRC_URI[md5sum] = "bde3d178b756597d2ec2a19ef60d2e1f"
10SRC_URI[sha256sum] = "548b91cb01087ad4f892428e7ac4955251cf12393e86c70420436b33848ef28a" 10SRC_URI[sha256sum] = "548b91cb01087ad4f892428e7ac4955251cf12393e86c70420436b33848ef28a"
11 11
12PR = "${INC_PR}.0" 12PR = "${INC_PR}.0"
13
14# These extensions are now integrated into the server, so declare the migration
15# path for in-place upgrades.
16
17RREPLACES_${PN} = "${PN}-extension-dri \
18 ${PN}-extension-dri2 \
19 ${PN}-extension-record \
20 ${PN}-extension-extmod \
21 ${PN}-extension-dbe \
22 "
23RPROVIDES_${PN} = "${PN}-extension-dri \
24 ${PN}-extension-dri2 \
25 ${PN}-extension-record \
26 ${PN}-extension-extmod \
27 ${PN}-extension-dbe \
28 "
29RCONFLICTS_${PN} = "${PN}-extension-dri \
30 ${PN}-extension-dri2 \
31 ${PN}-extension-record \
32 ${PN}-extension-extmod \
33 ${PN}-extension-dbe \
34 "
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-16 15:42:50 +0000