summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc129
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xorg-lite.inc8
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xorg-lite_1.11.2.bb4
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xorg.inc138
4 files changed, 134 insertions, 145 deletions
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
deleted file mode 100644
index 6133344b38..0000000000
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
+++ /dev/null
@@ -1,129 +0,0 @@
1DESCRIPTION = "The X.Org X server"
2HOMEPAGE = "http://www.x.org"
3SECTION = "x11/base"
4LICENSE = "MIT-X"
5LIC_FILES_CHKSUM = "file://COPYING;md5=74df27b6254cc88d2799b5f4f5949c00"
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
10PROVIDES = "virtual/xserver-xf86"
11
12# Other packages tend to just care that there is *an* X server:
13PROVIDES += "virtual/xserver"
14
15PE = "2"
16
17XORG_PN = "xorg-server"
18SRC_URI = "${XORG_MIRROR}/individual/xserver/${XORG_PN}-${PV}.tar.bz2"
19SRC_URI += "file://macro_tweak.patch"
20
21S = "${WORKDIR}/${XORG_PN}-${PV}"
22
23inherit autotools pkgconfig
24
25PROTO_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"
26LIB_DEPS = "pixman libxfont xtrans libxau libxext libxdmcp libdrm libxkbfile libpciaccess openssl"
27DEPENDS = "${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
43PACKAGES =+ "${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
67RRECOMMENDS_${PN} += "${PN}-security-policy xkeyboard-config rgb xserver-xf86-config"
68RDEPENDS_${PN}-xvfb += "xkeyboard-config"
69RREPLACES_${PN}-module-exa = "${PN}"
70
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"
72FILES_${PN}-dev += "${libdir}/xorg/modules/*.la ${libdir}/xorg/modules/*/*.la"
73FILES_${PN}-doc += "${libdir}/X11/doc ${datadir}/X11/xkb/compiled/README.compiled ${localstatedir}/lib/xkb/README.compiled"
74FILES_${PN}-dbg += "${libdir}/xorg/modules/.debug \
75 ${libdir}/xorg/modules/*/.debug \
76 ${libdir}/xorg/modules/*/*/.debug \
77 "
78FILES_${PN}-security-policy += "${libdir}/xserver/SecurityPolicy"
79FILES_${PN}-sdl = "${bindir}/Xsdl"
80FILES_${PN}-fbdev = "${bindir}/Xfbdev"
81FILES_${PN}-xprint = "${libdir}/X11/xserver/*/print"
82FILES_${PN}-xvfb = "${bindir}/Xvfb"
83FILES_${PN}-utils = "${bindir}/scanpci ${bindir}/pcitweak ${bindir}/ioport ${bindir}/in[bwl] ${bindir}/out[bwl] ${bindir}/mmap[rw] ${bindir}/gtf ${bindir}/getconfig ${bindir}/getconfig.pl"
84FILES_${PN}-xephyr = "${bindir}/Xephyr"
85FILES_${PN}-multimedia-modules = "${libdir}/xorg/modules/multimedia/*drv*"
86FILES_${PN}-extension-dri = "${libdir}/xorg/modules/extensions/libdri.so"
87FILES_${PN}-extension-dri2 = "${libdir}/xorg/modules/extensions/libdri2.so"
88FILES_${PN}-extension-glx = "${libdir}/xorg/modules/extensions/libglx.so"
89FILES_${PN}-extension-record = "${libdir}/xorg/modules/extensions/librecord.so"
90FILES_${PN}-extension-extmod = "${libdir}/xorg/modules/extensions/libextmod.so"
91FILES_${PN}-extension-dbe = "${libdir}/xorg/modules/extensions/libdbe.so"
92FILES_${PN}-module-libint10 = "${libdir}/xorg/modules/libint10.so"
93FILES_${PN}-module-libafb = "${libdir}/xorg/modules/libafb.so"
94FILES_${PN}-module-libwfb = "${libdir}/xorg/modules/libwfb.so"
95FILES_${PN}-module-libmfb = "${libdir}/xorg/modules/libmfb.so"
96FILES_${PN}-module-libcfb = "${libdir}/xorg/modules/libcfb.so"
97FILES_${PN}-module-exa = "${libdir}/xorg/modules/libexa.so"
98FILES_${PN}-module-xaa = "${libdir}/xorg/modules/libxaa.so"
99FILES_${PN}-module-libxf1bpp = "${libdir}/xorg/modules/libxf1bpp.so"
100FILES_${PN}-module-libxf4bpp = "${libdir}/xorg/modules/libxf4bpp.so"
101
102EXTRA_OECONF += "--with-fop=no \
103 --disable-static \
104 --disable-acfb \
105 --disable-ccfb \
106 --disable-mcfb \
107 --disable-xinerama \
108 --disable-xf86misc \
109 --disable-xorgcfg \
110 --disable-record \
111 --disable-dmx \
112 --disable-xnest \
113 --disable-xvfb \
114 --enable-composite \
115 --without-dtrace \
116 --sysconfdir=/etc/X11 \
117 --localstatedir=/var \
118 --with-fontdir=${datadir}/fonts/X11 \
119 --with-xkb-output=/var/lib/xkb \
120 ac_cv_file__usr_share_sgml_X11_defs_ent=no \
121"
122
123PACKAGECONFIG ??= "udev"
124PACKAGECONFIG[udev] = "--enable-config-udev,--disable-config-udev,udev"
125
126do_install_append () {
127 # Its assumed base-files creates this for us
128 rmdir ${D}${localstatedir}/log/
129}
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite.inc
deleted file mode 100644
index 02db5bf5a4..0000000000
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite.inc
+++ /dev/null
@@ -1,8 +0,0 @@
1require xserver-xorg-common.inc
2
3EXTRA_OECONF += "\
4 --disable-dri \
5 --disable-glx \
6 --disable-dga \
7 --without-xmlto \
8"
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite_1.11.2.bb b/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite_1.11.2.bb
deleted file mode 100644
index ec29b21d9b..0000000000
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite_1.11.2.bb
+++ /dev/null
@@ -1,4 +0,0 @@
1require xserver-xorg-lite.inc
2require xserver-xorg-${PV}.inc
3
4FILESEXTRAPATHS_append := "${THISDIR}/xserver-xorg:${THISDIR}/xserver-xorg-${PV}:"
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 @@
1require xserver-xorg-common.inc 1DESCRIPTION = "The X.Org X server"
2HOMEPAGE = "http://www.x.org"
3SECTION = "x11/base"
4LICENSE = "MIT-X"
5LIC_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
10PROVIDES = "virtual/xserver-xf86"
11
12# Other packages tend to just care that there is *an* X server:
13PROVIDES += "virtual/xserver"
14
15PE = "2"
16
17XORG_PN = "xorg-server"
18SRC_URI = "${XORG_MIRROR}/individual/xserver/${XORG_PN}-${PV}.tar.bz2"
19SRC_URI += "file://macro_tweak.patch"
20
21S = "${WORKDIR}/${XORG_PN}-${PV}"
22
23inherit autotools pkgconfig
24
25PROTO_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"
26LIB_DEPS = "pixman libxfont xtrans libxau libxext libxdmcp libdrm libxkbfile libpciaccess openssl"
27DEPENDS = "${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
43PACKAGES =+ "${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
67RRECOMMENDS_${PN} += "${PN}-security-policy xkeyboard-config rgb xserver-xf86-config"
68RDEPENDS_${PN}-xvfb += "xkeyboard-config"
69RREPLACES_${PN}-module-exa = "${PN}"
70
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"
72FILES_${PN}-dev += "${libdir}/xorg/modules/*.la ${libdir}/xorg/modules/*/*.la"
73FILES_${PN}-doc += "${libdir}/X11/doc ${datadir}/X11/xkb/compiled/README.compiled ${localstatedir}/lib/xkb/README.compiled"
74FILES_${PN}-dbg += "${libdir}/xorg/modules/.debug \
75 ${libdir}/xorg/modules/*/.debug \
76 ${libdir}/xorg/modules/*/*/.debug \
77 "
78FILES_${PN}-security-policy += "${libdir}/xserver/SecurityPolicy"
79FILES_${PN}-sdl = "${bindir}/Xsdl"
80FILES_${PN}-fbdev = "${bindir}/Xfbdev"
81FILES_${PN}-xprint = "${libdir}/X11/xserver/*/print"
82FILES_${PN}-xvfb = "${bindir}/Xvfb"
83FILES_${PN}-utils = "${bindir}/scanpci ${bindir}/pcitweak ${bindir}/ioport ${bindir}/in[bwl] ${bindir}/out[bwl] ${bindir}/mmap[rw] ${bindir}/gtf ${bindir}/getconfig ${bindir}/getconfig.pl"
84FILES_${PN}-xephyr = "${bindir}/Xephyr"
85FILES_${PN}-multimedia-modules = "${libdir}/xorg/modules/multimedia/*drv*"
86FILES_${PN}-extension-dri = "${libdir}/xorg/modules/extensions/libdri.so"
87FILES_${PN}-extension-dri2 = "${libdir}/xorg/modules/extensions/libdri2.so"
88FILES_${PN}-extension-glx = "${libdir}/xorg/modules/extensions/libglx.so"
89FILES_${PN}-extension-record = "${libdir}/xorg/modules/extensions/librecord.so"
90FILES_${PN}-extension-extmod = "${libdir}/xorg/modules/extensions/libextmod.so"
91FILES_${PN}-extension-dbe = "${libdir}/xorg/modules/extensions/libdbe.so"
92FILES_${PN}-module-libint10 = "${libdir}/xorg/modules/libint10.so"
93FILES_${PN}-module-libafb = "${libdir}/xorg/modules/libafb.so"
94FILES_${PN}-module-libwfb = "${libdir}/xorg/modules/libwfb.so"
95FILES_${PN}-module-libmfb = "${libdir}/xorg/modules/libmfb.so"
96FILES_${PN}-module-libcfb = "${libdir}/xorg/modules/libcfb.so"
97FILES_${PN}-module-exa = "${libdir}/xorg/modules/libexa.so"
98FILES_${PN}-module-xaa = "${libdir}/xorg/modules/libxaa.so"
99FILES_${PN}-module-libxf1bpp = "${libdir}/xorg/modules/libxf1bpp.so"
100FILES_${PN}-module-libxf4bpp = "${libdir}/xorg/modules/libxf4bpp.so"
101
102EXTRA_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
126PACKAGECONFIG ??= "udev"
127PACKAGECONFIG[udev] = "--enable-config-udev,--disable-config-udev,udev"
128
129do_install_append () {
130 # Its assumed base-files creates this for us
131 rmdir ${D}${localstatedir}/log/
132}
133
134
135# Mesa/GLX/DRI
3PROTO_DEPS += "xf86driproto dri2proto" 136PROTO_DEPS += "xf86driproto dri2proto"
4LIB_DEPS += "mesa-dri" 137LIB_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"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-11-02 02:13:26 +0000