diff options
author | Chris Larson <kergoth@openedhand.com> | 2006-08-15 11:58:37 +0000 |
---|---|---|
committer | Chris Larson <kergoth@openedhand.com> | 2006-08-15 11:58:37 +0000 |
commit | ca10363baac7de9581ec90ab47957f973e1dbdc4 (patch) | |
tree | 2000b53f806c79510671d8fd1a6a36125f8b25b3 /meta/packages/xorg-xserver/xserver-xorg_6.8.99.10.bb | |
parent | c210d01a7ca8c00ddc45d292878b89086b137129 (diff) | |
download | openembedded-core-ca10363baac7de9581ec90ab47957f973e1dbdc4.tar.gz openembedded-core-ca10363baac7de9581ec90ab47957f973e1dbdc4.tar.bz2 openembedded-core-ca10363baac7de9581ec90ab47957f973e1dbdc4.tar.xz openembedded-core-ca10363baac7de9581ec90ab47957f973e1dbdc4.zip |
Numerous new xorg package versions from upstream OE. Pester me if any local changes got inadvertantly lost, or if any packages need upgrading.
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@607 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages/xorg-xserver/xserver-xorg_6.8.99.10.bb')
-rw-r--r-- | meta/packages/xorg-xserver/xserver-xorg_6.8.99.10.bb | 65 |
1 files changed, 65 insertions, 0 deletions
diff --git a/meta/packages/xorg-xserver/xserver-xorg_6.8.99.10.bb b/meta/packages/xorg-xserver/xserver-xorg_6.8.99.10.bb new file mode 100644 index 000000000..37546fe1e --- /dev/null +++ b/meta/packages/xorg-xserver/xserver-xorg_6.8.99.10.bb @@ -0,0 +1,65 @@ +SECTION = "x11/base" +RPROVIDES = "virtual/xserver" +PROVIDES = "virtual/xserver" +LICENSE = "Xorg" +PR = "r2" + +DEPENDS = "fontconfig freetype libxi libxmu flex-native zlib" + +SRC_URI = "${FREEDESKTOP_CVS}/xorg;module=xc;method=pserver;tag=XORG-6_8_99_10 \ + file://imake-staging.patch;patch=1 \ + file://imake-installed.patch;patch=1 \ + file://fontfile.patch;patch=1 file://freetype.patch;patch=1 \ + file://dri.patch;patch=1" + +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 /etc/X11/xserver/*/print ${sysconfdir}/profile.d/xprint.*" +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" +FILES_${PN}-doc += "${libdir}/X11/doc" + +do_configure() { + cat <<EOF > config/cf/host.def +#define BuildServersOnly YES +#define ProjectRoot ${prefix} +#define XnestServer NO +#define XdmxServer NO +#define CcCmd gcc +#define LdCmd ld +#define HasFreetype2 YES +#define HasFontconfig YES +#define BuildDevelDRIDrivers YES +#define BuildXF86DRI YES +EOF + echo "" > config/cf/date.def + rm -f include/extensions/panoramiX.h + make -C config/imake -f Makefile.ini CC="${BUILD_CC}" BOOTSTRAPCFLAGS="${BUILD_CFLAGS}" CROSSCOMPILEDIR="${CROSS_DIR}/${TARGET_SYS}/bin" PREPROCESS_CMD="gcc -E" clean imake + make CC="${BUILD_CC}" xmakefile + make Makefiles + make clean +} + +do_compile() { + #make depend + make includes + make -C config/util CC="${BUILD_CC}" + for l in font xtrans Xdmcp lbxutil; do make -C lib/$l CC="${CC}" LD="${LD}" CC_STAGING="-I${STAGING_INCDIR}" LD_STAGING="-L${STAGING_LIBDIR}"; done + make -C programs/Xserver CC="${CC}" LD="${LD}" CC_STAGING="-I${STAGING_INCDIR}" LD_STAGING="-L${STAGING_LIBDIR}" INSTALLED_LIBS="" CPP="${CC} -E" +} + +do_install() { + make -C programs/Xserver DESTDIR="${D}" CC="${CC}" LD="${LD}" CC_STAGING="-I${STAGING_INCDIR}" LD_STAGING="-L${STAGING_LIBDIR}" INSTALLED_LIBS="" install + make -C lib/font DESTDIR="${D}" CC="${CC}" LD="${LD}" CC_STAGING="-I${STAGING_INCDIR}" LD_STAGING="-L${STAGING_LIBDIR}" INSTALLED_LIBS="" 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/ +} |