From 7ff55c4f8b69f279aa6a8b7f481705149f7a07d7 Mon Sep 17 00:00:00 2001 From: Phil Blundell Date: Sat, 18 Sep 2004 14:24:45 +0000 Subject: add header staging BKrev: 414c452dZ3gwNfrB2IHrZnmRpEtgmg --- xserver/xserver-xorg_6.8.oe | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) (limited to 'xserver/xserver-xorg_6.8.oe') diff --git a/xserver/xserver-xorg_6.8.oe b/xserver/xserver-xorg_6.8.oe index ccc8e7dfec..399459c2e3 100644 --- a/xserver/xserver-xorg_6.8.oe +++ b/xserver/xserver-xorg_6.8.oe @@ -1,15 +1,16 @@ +PR = "r1" + 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 \ - ${SOURCEFORGE_MIRROR}/unichrome/unichrome-X-r25.tar.gz \ + cvs://anonymous@cvs.sourceforge.net/cvsroot/unichrome;tag=release;method=pserver;module=xfree86 \ file://imake-staging.patch;patch=1 \ file://dri.patch;patch=1" S = "${WORKDIR}/xc" -FILES_${PN} += "${libdir}/modules/*.o "${libdir}/modules/*/*.o ${libdir}/X11/Options ${libdir}/X11/getconfig ${libdir}/X11/etc" +FILES_${PN} += "${libdir}/modules/*.o "${libdir}/modules/*/*.o ${libdir}/X11/Options ${libdir}/X11/getconfig ${libdir}/X11/etc ${libdir}/modules" FILES_${PN}-doc += "${libdir}/X11/doc" -FILES_${PN}-dev += "${libdir}/modules" do_configure() { echo "#define BuildServersOnly YES" > config/cf/host.def @@ -17,7 +18,7 @@ do_configure() { echo "#define CcCmd ${CC}" >> config/cf/host.def echo "#define LdCmd ${LD}" >> config/cf/host.def echo "" > config/cf/date.def - cp ${WORKDIR}/unichrome-X-r25/* ${S}/programs/Xserver/hw/xfree86/drivers/via/ + cp -r ${WORKDIR}/xfree86/* ${S}/programs/Xserver/hw/xfree86/drivers/via/ } do_compile() { @@ -35,3 +36,12 @@ do_compile() { do_install() { make -C programs/Xserver DESTDIR="${D}" CC="${CC}" LD="${LD}" CC_STAGING="-I${STAGING_INCDIR}" LD_STAGING="-L${STAGING_LIBDIR}" install } + +do_stage() { + install -d ${STAGING_INCDIR}/xserver-xorg + for i in i810 via; do + 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/ +} + -- cgit v1.2.3