diff options
| author | nslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net> | 2005-06-03 20:40:11 +0000 |
|---|---|---|
| committer | nslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net> | 2005-06-03 20:40:11 +0000 |
| commit | 1547525ce9903bd9fd79ac57072e9a585b5cd6d1 (patch) | |
| tree | 8c256cd9c3862a5e8a43646d6830e05f310f6dd0 /packages/xserver | |
| parent | e216d52f67cee3dbb359da1d327c671d87006d59 (diff) | |
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
Diffstat (limited to 'packages/xserver')
| -rw-r--r-- | packages/xserver/xserver-xorg/fontfile.patch | 0 | ||||
| -rw-r--r-- | packages/xserver/xserver-xorg/freetype.patch | 0 | ||||
| -rw-r--r-- | packages/xserver/xserver-xorg_6.8.99.5.bb | 3 |
3 files changed, 2 insertions, 1 deletions
diff --git a/packages/xserver/xserver-xorg/fontfile.patch b/packages/xserver/xserver-xorg/fontfile.patch new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/xserver/xserver-xorg/fontfile.patch diff --git a/packages/xserver/xserver-xorg/freetype.patch b/packages/xserver/xserver-xorg/freetype.patch new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/xserver/xserver-xorg/freetype.patch diff --git a/packages/xserver/xserver-xorg_6.8.99.5.bb b/packages/xserver/xserver-xorg_6.8.99.5.bb index 63bf99184d..0a21a7da9a 100644 --- 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" |