diff options
Diffstat (limited to 'meta-emenlow/recipes-graphics/xorg-xserver')
8 files changed, 125 insertions, 0 deletions
diff --git a/meta-emenlow/recipes-graphics/xorg-xserver/files/crosscompile.patch b/meta-emenlow/recipes-graphics/xorg-xserver/files/crosscompile.patch new file mode 100644 index 00000000..2341e40b --- /dev/null +++ b/meta-emenlow/recipes-graphics/xorg-xserver/files/crosscompile.patch | |||
@@ -0,0 +1,19 @@ | |||
1 | Index: xorg-server-1.7.99.2/configure.ac | ||
2 | =================================================================== | ||
3 | --- xorg-server-1.7.99.2.orig/configure.ac 2010-01-29 16:38:49.000000000 +0000 | ||
4 | +++ xorg-server-1.7.99.2/configure.ac 2010-01-29 16:42:39.000000000 +0000 | ||
5 | @@ -503,14 +503,10 @@ | ||
6 | |||
7 | dnl Uses --default-font-path if set, otherwise checks for /etc/X11/fontpath.d, | ||
8 | dnl otherwise uses standard subdirectories of FONTROOTDIR | ||
9 | -AC_CHECK_FILE([${sysconfdir}/X11/fontpath.d], | ||
10 | - [DEFAULT_FONT_PATH='catalogue:${sysconfdir}/X11/fontpath.d'], | ||
11 | - [ | ||
12 | DEFAULT_FONT_PATH="${FONTMISCDIR}/,${FONTTTFDIR}/,${FONTOTFDIR}/,${FONTTYPE1DIR}/,${FONT100DPIDIR}/,${FONT75DPIDIR}/" | ||
13 | case $host_os in | ||
14 | darwin*) DEFAULT_FONT_PATH="${DEFAULT_FONT_PATH},/Library/Fonts,/System/Library/Fonts" ;; | ||
15 | esac | ||
16 | - ]) | ||
17 | AC_ARG_WITH(default-font-path, AS_HELP_STRING([--with-default-font-path=PATH], [Comma separated list of font dirs]), | ||
18 | [ FONTPATH="$withval" ], | ||
19 | [ FONTPATH="${DEFAULT_FONT_PATH}" ]) | ||
diff --git a/meta-emenlow/recipes-graphics/xorg-xserver/files/fix_open_max_preprocessor_error.patch b/meta-emenlow/recipes-graphics/xorg-xserver/files/fix_open_max_preprocessor_error.patch new file mode 100644 index 00000000..565832ee --- /dev/null +++ b/meta-emenlow/recipes-graphics/xorg-xserver/files/fix_open_max_preprocessor_error.patch | |||
@@ -0,0 +1,13 @@ | |||
1 | Index: git/os/osdep.h | ||
2 | =================================================================== | ||
3 | --- git.orig/os/osdep.h 2008-10-07 18:38:21.000000000 +0100 | ||
4 | +++ git/os/osdep.h 2008-10-07 18:39:36.000000000 +0100 | ||
5 | @@ -92,7 +92,7 @@ | ||
6 | * like sysconf(_SC_OPEN_MAX) is not supported. | ||
7 | */ | ||
8 | |||
9 | -#if OPEN_MAX <= 256 | ||
10 | +#if 0 | ||
11 | #define MAXSOCKS (OPEN_MAX - 1) | ||
12 | #else | ||
13 | #define MAXSOCKS 256 | ||
diff --git a/meta-emenlow/recipes-graphics/xorg-xserver/files/libdrm-poulsbo.patch b/meta-emenlow/recipes-graphics/xorg-xserver/files/libdrm-poulsbo.patch new file mode 100644 index 00000000..b604cab7 --- /dev/null +++ b/meta-emenlow/recipes-graphics/xorg-xserver/files/libdrm-poulsbo.patch | |||
@@ -0,0 +1,26 @@ | |||
1 | # Make the server depend on libdrm-poulsbo instead of libdrm so that the | ||
2 | # emenlow libdrm can coexist with the normal libdrm. | ||
3 | # jdike@linux.intel.com | ||
4 | |||
5 | Index: xorg-server-1.7.99.2/configure.ac | ||
6 | =================================================================== | ||
7 | --- xorg-server-1.7.99.2.orig/configure.ac | ||
8 | +++ xorg-server-1.7.99.2/configure.ac | ||
9 | @@ -763,7 +763,7 @@ dnl List of libraries that require a spe | ||
10 | LIBAPPLEWM="applewm >= 1.4" | ||
11 | LIBDMX="dmx >= 1.0.99.1" | ||
12 | LIBDRI="dri >= 7.1.0" | ||
13 | -LIBDRM="libdrm >= 2.3.0" | ||
14 | +LIBDRM="libdrm_poulsbo >= 2.3.0" | ||
15 | LIBGL="gl >= 7.1.0" | ||
16 | LIBXEXT="xext >= 1.0.99.4" | ||
17 | LIBXI="xi >= 1.2.99.1" | ||
18 | @@ -2002,7 +2002,7 @@ if test "$KDRIVE" = yes; then | ||
19 | XEPHYR_REQUIRED_LIBS="$XEPHYR_REQUIRED_LIBS xv" | ||
20 | fi | ||
21 | if test "x$DRI" = xyes && test "x$GLX" = xyes; then | ||
22 | - XEPHYR_REQUIRED_LIBS="$XEPHYR_REQUIRED_LIBS $LIBGL libdrm" | ||
23 | + XEPHYR_REQUIRED_LIBS="$XEPHYR_REQUIRED_LIBS $LIBGL libdrm_poulsbo" | ||
24 | fi | ||
25 | |||
26 | PKG_CHECK_MODULES(XEPHYR, $XEPHYR_REQUIRED_LIBS, [xephyr="yes"], [xephyr="no"]) | ||
diff --git a/meta-emenlow/recipes-graphics/xorg-xserver/files/macro_tweak.patch b/meta-emenlow/recipes-graphics/xorg-xserver/files/macro_tweak.patch new file mode 100644 index 00000000..6998adff --- /dev/null +++ b/meta-emenlow/recipes-graphics/xorg-xserver/files/macro_tweak.patch | |||
@@ -0,0 +1,18 @@ | |||
1 | Index: xorg-server-1.5.0/xorg-server.m4 | ||
2 | =================================================================== | ||
3 | --- xorg-server-1.5.0.orig/xorg-server.m4 2007-05-29 20:36:51.000000000 +0100 | ||
4 | +++ xorg-server-1.5.0/xorg-server.m4 2008-11-04 23:56:55.000000000 +0000 | ||
5 | @@ -28,9 +28,12 @@ | ||
6 | # Checks for the $1 define in xorg-server.h (from the sdk). If it | ||
7 | # is defined, then add $1 to $REQUIRED_MODULES. | ||
8 | |||
9 | +m4_pattern_allow(PKG_CONFIG_SYSROOT_DIR) | ||
10 | + | ||
11 | AC_DEFUN([XORG_DRIVER_CHECK_EXT],[ | ||
12 | + PKG_PROG_PKG_CONFIG | ||
13 | SAVE_CFLAGS="$CFLAGS" | ||
14 | - CFLAGS="$CFLAGS -I`pkg-config --variable=sdkdir xorg-server`" | ||
15 | + CFLAGS="$CFLAGS -I$PKG_CONFIG_SYSROOT_DIR`pkg-config --variable=sdkdir xorg-server`" | ||
16 | AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ | ||
17 | #include "xorg-server.h" | ||
18 | #if !defined $1 | ||
diff --git a/meta-emenlow/recipes-graphics/xorg-xserver/files/nodolt.patch b/meta-emenlow/recipes-graphics/xorg-xserver/files/nodolt.patch new file mode 100644 index 00000000..6b34032a --- /dev/null +++ b/meta-emenlow/recipes-graphics/xorg-xserver/files/nodolt.patch | |||
@@ -0,0 +1,12 @@ | |||
1 | Index: git/configure.ac | ||
2 | =================================================================== | ||
3 | --- git.orig/configure.ac 2009-01-15 20:35:31.000000000 +0000 | ||
4 | +++ git/configure.ac 2009-01-15 20:35:38.000000000 +0000 | ||
5 | @@ -62,7 +62,6 @@ | ||
6 | AC_LIBTOOL_WIN32_DLL | ||
7 | AC_DISABLE_STATIC | ||
8 | AC_PROG_LIBTOOL | ||
9 | -DOLT | ||
10 | AC_PROG_MAKE_SET | ||
11 | PKG_PROG_PKG_CONFIG | ||
12 | AC_PROG_LEX | ||
diff --git a/meta-emenlow/recipes-graphics/xorg-xserver/xserver-psb_1.7.99.2.bb b/meta-emenlow/recipes-graphics/xorg-xserver/xserver-psb_1.7.99.2.bb new file mode 100644 index 00000000..5227faa4 --- /dev/null +++ b/meta-emenlow/recipes-graphics/xorg-xserver/xserver-psb_1.7.99.2.bb | |||
@@ -0,0 +1,21 @@ | |||
1 | require recipes-graphics/xorg-xserver/xserver-xf86-dri-lite.inc | ||
2 | |||
3 | PR = "r3" | ||
4 | |||
5 | PROTO_DEPS += "xf86driproto dri2proto" | ||
6 | |||
7 | DEPENDS += "font-util" | ||
8 | |||
9 | SRC_URI += "file://nodolt.patch \ | ||
10 | file://crosscompile.patch \ | ||
11 | file://libdrm-poulsbo.patch" | ||
12 | |||
13 | # Misc build failure for master HEAD | ||
14 | SRC_URI += "file://fix_open_max_preprocessor_error.patch" | ||
15 | |||
16 | EXTRA_OECONF += "--enable-dri --enable-dri2 --enable-dga --enable-glx" | ||
17 | |||
18 | RDEPENDS_${PN} += "xserver-xorg-video-psb psb-firmware xpsb-glx \ | ||
19 | libdrm-poulsbo libva" | ||
20 | |||
21 | COMPATIBLE_MACHINE = "emenlow" | ||
diff --git a/meta-emenlow/recipes-graphics/xorg-xserver/xserver-xf86-config/emenlow/xorg.conf b/meta-emenlow/recipes-graphics/xorg-xserver/xserver-xf86-config/emenlow/xorg.conf new file mode 100644 index 00000000..68462638 --- /dev/null +++ b/meta-emenlow/recipes-graphics/xorg-xserver/xserver-xf86-config/emenlow/xorg.conf | |||
@@ -0,0 +1,13 @@ | |||
1 | Section "ServerFlags" | ||
2 | Option "AutoAddDevices" "False" | ||
3 | EndSection | ||
4 | |||
5 | Section "Device" | ||
6 | Identifier "Configured Video Device" | ||
7 | Driver "psb" | ||
8 | Option "ShadowFB" "False" | ||
9 | EndSection | ||
10 | |||
11 | Section "DRI" | ||
12 | Mode 0666 | ||
13 | EndSection | ||
diff --git a/meta-emenlow/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend b/meta-emenlow/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend new file mode 100644 index 00000000..4b8d0e65 --- /dev/null +++ b/meta-emenlow/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend | |||
@@ -0,0 +1,3 @@ | |||
1 | THISDIR := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}" | ||
2 | FILESPATH =. "${@base_set_filespath(["${THISDIR}/${PN}"], d)}:" | ||
3 | |||