From 7fe0adf92a965a1f5420bdf81faecee99df3dcfe Mon Sep 17 00:00:00 2001
From: Phil Blundell <philb@gnu.org>
Date: Sun, 3 Oct 2004 11:46:58 +0000
Subject: add x11.conf file move more xprint bits into xprint package
BKrev: 415fe6b23zTYFC2VjZqmm8hkQycKZA
---
xserver/xserver-xorg_6.8.oe | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
(limited to 'xserver')
diff --git a/xserver/xserver-xorg_6.8.oe b/xserver/xserver-xorg_6.8.oe
index 11dd0566a5..05faa035e0 100644
--- a/xserver/xserver-xorg_6.8.oe
+++ b/xserver/xserver-xorg_6.8.oe
@@ -1,17 +1,18 @@
-PR = "r2"
+PR = "r3"
DEPENDS = "freetype libxi xmu flex-2.5.4-native"
SRC_URI = "cvs://anoncvs@cvs.freedesktop.org/cvs/xorg;module=xc;tag=XORG-6_8_0;method=pserver \
cvs://anonymous@cvs.sourceforge.net/cvsroot/unichrome;tag=release;method=pserver;module=xfree86 \
file://imake-staging.patch;patch=1 \
- file://dri.patch;patch=1"
+ file://dri.patch;patch=1 \
+ file://xorg.conf"
PACKAGES =+ "xserver-xorg-xprint xserver-xorg-xvfb xserver-xorg-utils"
S = "${WORKDIR}/xc"
-FILES_xserver-xorg-xprint = "${bindir}/Xprt /etc/init.d/xprint /etc/rc.d/rc*.d/*xprint /etc/X11/Xsession.d/92xprint-xpserverlist.sh /etc/X11/xinit/xinitrc.d/92xprint-xpserverlist.sh"
+FILES_xserver-xorg-xprint = "${bindir}/Xprt /etc/init.d/xprint /etc/rc.d/rc*.d/*xprint /etc/X11/Xsession.d/92xprint-xpserverlist.sh /etc/X11/xinit/xinitrc.d/92xprint-xpserverlist.sh /etc/X11/xserver/*/print"
FILES_xserver-xorg-xvfb = "${bindir}/Xvfb"
FILES_xserver-xorg-utils = "${bindir}/scanpci ${bindir}/pcitweak ${bindir}/ioport ${bindir}/in[bwl] ${bindir}/out[bwl] ${bindir}/mmap[rw] ${bindir}/gtf ${bindir}/getconfig ${bindir}/getconfig.pl"
FILES_${PN} += "${libdir}/modules/*.o "${libdir}/modules/*/*.o ${libdir}/X11/Options ${libdir}/X11/getconfig ${libdir}/X11/etc ${libdir}/modules"
@@ -51,5 +52,9 @@ do_stage() {
pushd ${S}/programs/Xserver/hw/xfree86/drivers/$i; install -m 0644 *.h ${STAGING_INCDIR}/xserver-xorg/; popd
done
install -m 0644 programs/Xserver/hw/xfree86/common/fourcc.h ${STAGING_INCDIR}/xserver-xorg/
+ install -d ${D}/etc/X11
+ if [ -f "${WORKDIR}/xorg.conf" ]; then
+ install -m 0644 ${WORKDIR}/xorg.conf ${D}/etc/X11/
+ fi
}
--
cgit v1.2.3