[oe-commits] Koen Kooi : xserver-xorg: split out Xsdl and modules from ${PN} to save more space

[GIT User account]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: 05c9711294d060034fc1ecf6506268a3191b4e4e
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=05c9711294d060034fc1ecf6506268a3191b4e4e

Author: Koen Kooi <koen at openembedded.org>
Date:   Wed Dec 10 10:25:20 2008 +0100

xserver-xorg: split out Xsdl and modules from ${PN} to save more space

---

 packages/xorg-xserver/xorg-xserver-common.inc |   29 ++++++++++++++++++++++++-
 packages/xorg-xserver/xserver-xorg_1.5.3.bb   |    2 +-
 2 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/packages/xorg-xserver/xorg-xserver-common.inc b/packages/xorg-xserver/xorg-xserver-common.inc
index ddf8089..1cf1dbd 100644
--- a/packages/xorg-xserver/xorg-xserver-common.inc
+++ b/packages/xorg-xserver/xorg-xserver-common.inc
@@ -38,9 +38,10 @@ PACKAGES =+ "xserver-security-policy"
 FILES_xserver-security-policy += "${libdir}/xserver/SecurityPolicy"
 RRECOMMENDS_${PN} += "xserver-security-policy xkeyboard-config xorg-minimal-fonts rgb xserver-xorg-conf"
 
-PACKAGES =+ "${PN}-fbdev ${PN}-xprint ${PN}-xvfb ${PN}-utils ${PN}-xephyr"
+PACKAGES =+ "${PN}-sdl ${PN}-fbdev ${PN}-xprint ${PN}-xvfb ${PN}-utils ${PN}-xephyr"
 
 FILES_${PN}-fbdev = "${bindir}/Xfbdev"
+FILES_${PN}-sdl = "${bindir}/Xsdl"
 FILES_${PN}-xprint = "${libdir}/X11/xserver/*/print"
 FILES_${PN}-xvfb = "${bindir}/Xvfb"
 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"
@@ -53,6 +54,32 @@ FILES_${PN}-dbg += "${libdir}/xorg/modules/.debug \
 		    ${libdir}/xorg/modules/*/*/.debug \
 		    "
 
+# Split out some modules and extensions from the main package
+# These aren't needed for basic operations and only take up space:
+#  32.0k   libdri.so
+#  336.0k  libglx.so
+#  1360k   libint10.so
+#  180.0k  libwfb.so
+#  320.0k  libxaa.so
+#  124.0k  libxf1bpp.so
+#  84.0k   libxf4bpp.so
+
+PACKAGES =+ "${PN}-extension-dri ${PN}-extension-glx ${PN}-module-libint10 ${PN}-module-libwfb ${PN}-module-libmfb ${PN}-module-libcfb ${PN}-module-xaa ${PN}-module-libxf1bpp ${PN}-module-libxf4bpp"
+
+FILES_${PN}-extension-dri = "${libdir}/xorg/modules/extensions/libdri.so"
+FILES_${PN}-extension-glx = "${libdir}/xorg/modules/extensions/libglx.so"
+FILES_${PN}-module-libint10 = "${libdir}/xorg/modules/libint10.*"
+FILES_${PN}-module-libwfb = "${libdir}/xorg/modules/libwfb.*"
+FILES_${PN}-module-libmfb = "${libdir}/xorg/modules/libmfb.*"
+FILES_${PN}-module-libcfb = "${libdir}/xorg/modules/libcfb.*"
+FILES_${PN}-module-xaa = "${libdir}/xorg/modules/libxaa.*"
+FILES_${PN}-module-libxf1bpp = "${libdir}/xorg/modules/libxf1bpp.*"
+FILES_${PN}-module-libxf4bpp = "${libdir}/xorg/modules/libxf4bpp.*"
+
+PACKAGES =+ "${PN}-multimedia-modules"
+
+FILES_${PN}-multimedia-modules = "${libdir}/xorg/modules/multimedia/*drv*"
+
 do_stage() {
 	autotools_stage_all
 }
diff --git a/packages/xorg-xserver/xserver-xorg_1.5.3.bb b/packages/xorg-xserver/xserver-xorg_1.5.3.bb
index 378f5a1..1402c8e 100644
--- a/packages/xorg-xserver/xserver-xorg_1.5.3.bb
+++ b/packages/xorg-xserver/xserver-xorg_1.5.3.bb
@@ -3,7 +3,7 @@ require xorg-xserver-common.inc
 DESCRIPTION = "the X.Org X server"
 DEPENDS += "pixman libpciaccess openssl"
 PE = "2"
-PR = "r1"
+PR = "r3"
 
 SRC_URI += "file://drmfix.patch;patch=1 \
             file://sysroot_fix.patch;patch=1"