diff options
author | Richard Purdie <rpurdie@linux.intel.com> | 2008-10-29 14:55:26 +0000 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2008-10-29 14:55:26 +0000 |
commit | e61ea24100067bdcd82be23607500d1acbcc91cb (patch) | |
tree | 55433c486ae43889b43179a076624097e029ffb9 /meta/packages/xorg-xserver | |
parent | 3e7b691f60630bd224ab95374ddb5f3c108f645e (diff) | |
parent | f21745fa921c1eacb9740ba4f08813a54be4ab8d (diff) | |
download | openembedded-core-e61ea24100067bdcd82be23607500d1acbcc91cb.tar.gz openembedded-core-e61ea24100067bdcd82be23607500d1acbcc91cb.tar.bz2 openembedded-core-e61ea24100067bdcd82be23607500d1acbcc91cb.tar.xz openembedded-core-e61ea24100067bdcd82be23607500d1acbcc91cb.zip |
Merge branch 'pli1/X11-rework' of git@moblin-mdi.jf.intel.com:poky-staging into master-dev
Diffstat (limited to 'meta/packages/xorg-xserver')
-rw-r--r-- | meta/packages/xorg-xserver/xserver-xf86-dri-lite_git.bb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/packages/xorg-xserver/xserver-xf86-dri-lite_git.bb b/meta/packages/xorg-xserver/xserver-xf86-dri-lite_git.bb index 39e286570..1fe84a3b6 100644 --- a/meta/packages/xorg-xserver/xserver-xf86-dri-lite_git.bb +++ b/meta/packages/xorg-xserver/xserver-xf86-dri-lite_git.bb @@ -10,7 +10,8 @@ DEFAULT_PREFERENCE = "-1" SRC_URI = "git://anongit.freedesktop.org/git/xorg/xserver;protocol=git \ file://xorg.conf \ - file://libdri-xinerama-symbol.patch;patch=1" + file://libdri-xinerama-symbol.patch;patch=1 \ + file://xserver-boottime.patch;patch=1" # Misc build failure for master HEAD SRC_URI += "file://fix_open_max_preprocessor_error.patch;patch=1" |