summaryrefslogtreecommitdiff
path: root/packages/xserver/xserver-xorg_6.8.99.10.bb
diff options
context:
space:
mode:
authornslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net>2005-06-18 20:40:07 +0000
committernslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net>2005-06-18 20:40:07 +0000
commit4a6e0401513845984d7ab562eb71c91665dadf03 (patch)
tree53c9472d0ddb208f90c8aa58eeb610a34d9719f1 /packages/xserver/xserver-xorg_6.8.99.10.bb
parente7edf4f859009bb51a6f30b3364ba1392781ca1c (diff)
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/06/18 21:39:34+01:00 reciva.com!pb update xserver-xorg to 6.8.99.11 2005/06/18 21:11:33+01:00 reciva.com!pb Merge bk://oe-devel@openembedded-devel.bkbits.net/openembedded into mill.internal.reciva.com:/nexus/home/pb/oe/oe 2005/06/18 21:08:30+01:00 reciva.com!pb enable DRI and XvMC 2005/06/18 22:07:33+02:00 handhelds.org!zecke Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into handhelds.org:/home/ich/programming/oe/openembedded 2005/06/18 22:06:40+02:00 handhelds.org!zecke opie-reader: build Flite Speach output for the CVS version Patch courtsey Patrick Ohly 2005/06/18 21:59:49+02:00 handhelds.org!zecke flite: use oe_libinstall to stage libraries. This is courtsey Patrick Ohly from #82 2005/06/18 21:41:35+02:00 utwente.nl!koen Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into bitbake.utwente.nl:/home/koen/OE/openembedded 2005/06/18 21:41:23+02:00 utwente.nl!koen Move kdrive 20050610 - 20050617 Add ipaq-pxa270.conf, this should go away after we can build a mixed pxa25x and pxa27x kernel BKrev: 42b486a7G2urnoZuu7G_o4lcP8woVQ
Diffstat (limited to 'packages/xserver/xserver-xorg_6.8.99.10.bb')
-rw-r--r--packages/xserver/xserver-xorg_6.8.99.10.bb23
1 files changed, 13 insertions, 10 deletions
diff --git a/packages/xserver/xserver-xorg_6.8.99.10.bb b/packages/xserver/xserver-xorg_6.8.99.10.bb
index aa8fff95a4..0358b0688f 100644
--- a/packages/xserver/xserver-xorg_6.8.99.10.bb
+++ b/packages/xserver/xserver-xorg_6.8.99.10.bb
@@ -2,7 +2,7 @@ SECTION = "x11/base"
RPROVIDES = "virtual/xserver"
PROVIDES = "virtual/xserver"
LICENSE = "Xorg"
-PR = "r1"
+PR = "r2"
DEPENDS = "fontconfig freetype libxi xmu flex-native zlib"
@@ -23,15 +23,18 @@ FILES_${PN} += "${libdir}/modules/*.o "${libdir}/modules/*/*.o ${libdir}/X11/Opt
FILES_${PN}-doc += "${libdir}/X11/doc"
do_configure() {
- echo "#define BuildServersOnly YES" > config/cf/host.def
- echo "#define ProjectRoot /usr" >> config/cf/host.def
- echo "#define XnestServer NO" >> config/cf/host.def
- echo "#define XdmxServer NO" >> config/cf/host.def
- echo "#define CcCmd gcc" >> config/cf/host.def
- echo "#define LdCmd ld" >> config/cf/host.def
- echo "#define HasFreetype2 YES" >> config/cf/host.def
- echo "#define HasFontconfig YES" >> config/cf/host.def
- echo "#define BuildDevelDRIDrivers YES" >>config/cf/host.def
+ 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