Merge bk://oe-devel.bkbits.net/openembedded

into  bkbits.net:/repos/n/nslu2-linux/openembedded

2005/06/03 21:04:18+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/03 21:01:32+01:00 reciva.com!pb
fix DEPENDS to cope with disappearing flex-2.5.4
add patches to work around staging-related CFLAGS issues

BKrev: 42a0c02bmCBsApSS_9Mp7dPdyiwgbQ

diff --git a/packages/xserver/xserver-xorg/fontfile.patch b/packages/xserver/xserver-xorg/fontfile.patch
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/packages/xserver/xserver-xorg/freetype.patch b/packages/xserver/xserver-xorg/freetype.patch
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/packages/xserver/xserver-xorg_6.8.99.5.bb b/packages/xserver/xserver-xorg_6.8.99.5.bb
index 63bf991..0a21a7d 100644 (file)
--- a/packages/xserver/xserver-xorg_6.8.99.5.bb
+++ b/packages/xserver/xserver-xorg_6.8.99.5.bb
@@ -4,11 +4,12 @@ PROVIDES = "virtual/xserver"
 LICENSE = "Xorg"
 PR = "r1"
 
-DEPENDS = "fontconfig freetype libxi xmu flex-2.5.4-native"
+DEPENDS = "fontconfig freetype libxi xmu flex-native zlib"
 
 SRC_URI = "cvs://anoncvs@cvs.freedesktop.org/cvs/xorg;module=xc;method=pserver;tag=XORG-6_8_99_5 \
        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"