diff options
Diffstat (limited to 'meta-emenlow/packages/xorg-xserver')
7 files changed, 93 insertions, 0 deletions
diff --git a/meta-emenlow/packages/xorg-xserver/files/crosscompile.patch b/meta-emenlow/packages/xorg-xserver/files/crosscompile.patch new file mode 100644 index 000000000..2341e40bc --- /dev/null +++ b/meta-emenlow/packages/xorg-xserver/files/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-emenlow/packages/xorg-xserver/files/fix_open_max_preprocessor_error.patch b/meta-emenlow/packages/xorg-xserver/files/fix_open_max_preprocessor_error.patch new file mode 100644 index 000000000..565832eed --- /dev/null +++ b/meta-emenlow/packages/xorg-xserver/files/fix_open_max_preprocessor_error.patch @@ -0,0 +1,13 @@ +Index: git/os/osdep.h +=================================================================== +--- git.orig/os/osdep.h 2008-10-07 18:38:21.000000000 +0100 ++++ git/os/osdep.h 2008-10-07 18:39:36.000000000 +0100 +@@ -92,7 +92,7 @@ + * like sysconf(_SC_OPEN_MAX) is not supported. + */ + +-#if OPEN_MAX <= 256 ++#if 0 + #define MAXSOCKS (OPEN_MAX - 1) + #else + #define MAXSOCKS 256 diff --git a/meta-emenlow/packages/xorg-xserver/files/macro_tweak.patch b/meta-emenlow/packages/xorg-xserver/files/macro_tweak.patch new file mode 100644 index 000000000..6998adffe --- /dev/null +++ b/meta-emenlow/packages/xorg-xserver/files/macro_tweak.patch @@ -0,0 +1,18 @@ +Index: xorg-server-1.5.0/xorg-server.m4 +=================================================================== +--- xorg-server-1.5.0.orig/xorg-server.m4 2007-05-29 20:36:51.000000000 +0100 ++++ xorg-server-1.5.0/xorg-server.m4 2008-11-04 23:56:55.000000000 +0000 +@@ -28,9 +28,12 @@ + # Checks for the $1 define in xorg-server.h (from the sdk). If it + # is defined, then add $1 to $REQUIRED_MODULES. + ++m4_pattern_allow(PKG_CONFIG_SYSROOT_DIR) ++ + AC_DEFUN([XORG_DRIVER_CHECK_EXT],[ ++ PKG_PROG_PKG_CONFIG + SAVE_CFLAGS="$CFLAGS" +- CFLAGS="$CFLAGS -I`pkg-config --variable=sdkdir xorg-server`" ++ CFLAGS="$CFLAGS -I$PKG_CONFIG_SYSROOT_DIR`pkg-config --variable=sdkdir xorg-server`" + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ + #include "xorg-server.h" + #if !defined $1 diff --git a/meta-emenlow/packages/xorg-xserver/files/nodolt.patch b/meta-emenlow/packages/xorg-xserver/files/nodolt.patch new file mode 100644 index 000000000..6b34032a3 --- /dev/null +++ b/meta-emenlow/packages/xorg-xserver/files/nodolt.patch @@ -0,0 +1,12 @@ +Index: git/configure.ac +=================================================================== +--- git.orig/configure.ac 2009-01-15 20:35:31.000000000 +0000 ++++ git/configure.ac 2009-01-15 20:35:38.000000000 +0000 +@@ -62,7 +62,6 @@ + AC_LIBTOOL_WIN32_DLL + AC_DISABLE_STATIC + AC_PROG_LIBTOOL +-DOLT + AC_PROG_MAKE_SET + PKG_PROG_PKG_CONFIG + AC_PROG_LEX diff --git a/meta-emenlow/packages/xorg-xserver/xserver-psb_1.7.99.2.bb b/meta-emenlow/packages/xorg-xserver/xserver-psb_1.7.99.2.bb new file mode 100644 index 000000000..d6ecdae25 --- /dev/null +++ b/meta-emenlow/packages/xorg-xserver/xserver-psb_1.7.99.2.bb @@ -0,0 +1,17 @@ +require ../meta/packages/xorg-xserver/xserver-xf86-dri-lite.inc + +PR = "r1" + +PROTO_DEPS += "xf86driproto dri2proto" + +DEPENDS += "font-util" + +SRC_URI += "file://nodolt.patch;patch=1 \ + file://crosscompile.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 --enable-dga --enable-glx" + +DEPENDS += "psb-firmware xpsb-glx psb-kernel-source libdrm-poulsbo libva" diff --git a/meta-emenlow/packages/xorg-xserver/xserver-xf86-config/xorg.conf b/meta-emenlow/packages/xorg-xserver/xserver-xf86-config/xorg.conf new file mode 100644 index 000000000..684626383 --- /dev/null +++ b/meta-emenlow/packages/xorg-xserver/xserver-xf86-config/xorg.conf @@ -0,0 +1,13 @@ +Section "ServerFlags" + Option "AutoAddDevices" "False" +EndSection + +Section "Device" + Identifier "Configured Video Device" + Driver "psb" + Option "ShadowFB" "False" +EndSection + +Section "DRI" + Mode 0666 +EndSection diff --git a/meta-emenlow/packages/xorg-xserver/xserver-xf86-config_0.1.bbappend b/meta-emenlow/packages/xorg-xserver/xserver-xf86-config_0.1.bbappend new file mode 100644 index 000000000..1e9c3789e --- /dev/null +++ b/meta-emenlow/packages/xorg-xserver/xserver-xf86-config_0.1.bbappend @@ -0,0 +1 @@ +FILESPATH := "${FILESPATH}:${@os.path.dirname(bb.data.getVar('FILE', d, True))}" |