diff options
author | Richard Purdie <rpurdie@linux.intel.com> | 2010-02-03 00:29:41 +0000 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-02-03 00:29:41 +0000 |
commit | 4cb58790daad0b069c93158c4270d2367e3fa100 (patch) | |
tree | 26dcc03d5b6af534cbe5612c05221ed3a62e096d /meta/packages/xorg-xserver | |
parent | 5daaa63bdbb2f1293e1d716aed3db043a4e4b149 (diff) | |
download | openembedded-core-4cb58790daad0b069c93158c4270d2367e3fa100.tar.gz openembedded-core-4cb58790daad0b069c93158c4270d2367e3fa100.tar.bz2 openembedded-core-4cb58790daad0b069c93158c4270d2367e3fa100.zip |
xorg: Bulk version upgrades
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta/packages/xorg-xserver')
-rw-r--r-- | meta/packages/xorg-xserver/xserver-xf86-dri-lite/crosscompile.patch | 19 | ||||
-rw-r--r-- | meta/packages/xorg-xserver/xserver-xf86-dri-lite_1.7.99.2.bb | 18 |
2 files changed, 37 insertions, 0 deletions
diff --git a/meta/packages/xorg-xserver/xserver-xf86-dri-lite/crosscompile.patch b/meta/packages/xorg-xserver/xserver-xf86-dri-lite/crosscompile.patch new file mode 100644 index 0000000000..2341e40bca --- /dev/null +++ b/meta/packages/xorg-xserver/xserver-xf86-dri-lite/crosscompile.patch @@ -0,0 +1,19 @@ +Index: xorg-server-1.7.99.2/configure.ac +=================================================================== +--- xorg-server-1.7.99.2.orig/configure.ac 2010-01-29 16:38:49.000000000 +0000 ++++ xorg-server-1.7.99.2/configure.ac 2010-01-29 16:42:39.000000000 +0000 +@@ -503,14 +503,10 @@ + + dnl Uses --default-font-path if set, otherwise checks for /etc/X11/fontpath.d, + dnl otherwise uses standard subdirectories of FONTROOTDIR +-AC_CHECK_FILE([${sysconfdir}/X11/fontpath.d], +- [DEFAULT_FONT_PATH='catalogue:${sysconfdir}/X11/fontpath.d'], +- [ + DEFAULT_FONT_PATH="${FONTMISCDIR}/,${FONTTTFDIR}/,${FONTOTFDIR}/,${FONTTYPE1DIR}/,${FONT100DPIDIR}/,${FONT75DPIDIR}/" + case $host_os in + darwin*) DEFAULT_FONT_PATH="${DEFAULT_FONT_PATH},/Library/Fonts,/System/Library/Fonts" ;; + esac +- ]) + AC_ARG_WITH(default-font-path, AS_HELP_STRING([--with-default-font-path=PATH], [Comma separated list of font dirs]), + [ FONTPATH="$withval" ], + [ FONTPATH="${DEFAULT_FONT_PATH}" ]) diff --git a/meta/packages/xorg-xserver/xserver-xf86-dri-lite_1.7.99.2.bb b/meta/packages/xorg-xserver/xserver-xf86-dri-lite_1.7.99.2.bb new file mode 100644 index 0000000000..cde1712992 --- /dev/null +++ b/meta/packages/xorg-xserver/xserver-xf86-dri-lite_1.7.99.2.bb @@ -0,0 +1,18 @@ +require xserver-xf86-dri-lite.inc + +PE = "1" +PR = "r3" + +PROTO_DEPS += "xf86driproto dri2proto" + +DEPENDS += "font-util" + +SRC_URI += "file://nodolt.patch;patch=1 \ + file://crosscompile.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" + +EXTRA_OECONF += "--enable-dri --enable-dri2" |