diff options
Diffstat (limited to 'meta-emenlow/packages/xorg-xserver')
| -rw-r--r-- | meta-emenlow/packages/xorg-xserver/files/libdrm-poulsbo.patch | 26 | ||||
| -rw-r--r-- | meta-emenlow/packages/xorg-xserver/xserver-psb_1.7.99.2.bb | 11 |
2 files changed, 32 insertions, 5 deletions
diff --git a/meta-emenlow/packages/xorg-xserver/files/libdrm-poulsbo.patch b/meta-emenlow/packages/xorg-xserver/files/libdrm-poulsbo.patch new file mode 100644 index 0000000000..2f036f1baa --- /dev/null +++ b/meta-emenlow/packages/xorg-xserver/files/libdrm-poulsbo.patch @@ -0,0 +1,26 @@ +# Make the server depend on libdrm-poulsbo instead of libdrm so that the +# emenlow libdrm can coexist with the normal libdrm. +# jdike@linux.intel.com + +Index: xorg-server-1.7.99.2/configure.ac +=================================================================== +--- xorg-server-1.7.99.2.orig/configure.ac ++++ xorg-server-1.7.99.2/configure.ac +@@ -763,7 +763,7 @@ dnl List of libraries that require a spe + LIBAPPLEWM="applewm >= 1.4" + LIBDMX="dmx >= 1.0.99.1" + LIBDRI="dri >= 7.1.0" +-LIBDRM="libdrm >= 2.3.0" ++LIBDRM="libdrm-poulsbo >= 2.3.0" + LIBGL="gl >= 7.1.0" + LIBXEXT="xext >= 1.0.99.4" + LIBXI="xi >= 1.2.99.1" +@@ -2002,7 +2002,7 @@ if test "$KDRIVE" = yes; then + XEPHYR_REQUIRED_LIBS="$XEPHYR_REQUIRED_LIBS xv" + fi + if test "x$DRI" = xyes && test "x$GLX" = xyes; then +- XEPHYR_REQUIRED_LIBS="$XEPHYR_REQUIRED_LIBS $LIBGL libdrm" ++ XEPHYR_REQUIRED_LIBS="$XEPHYR_REQUIRED_LIBS $LIBGL libdrm-poulsbo" + fi + + PKG_CHECK_MODULES(XEPHYR, $XEPHYR_REQUIRED_LIBS, [xephyr="yes"], [xephyr="no"]) 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 index a732f089f9..60906919ca 100644 --- 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 @@ -1,19 +1,20 @@ require ../meta/packages/xorg-xserver/xserver-xf86-dri-lite.inc -PR = "r1" +PR = "r2" PROTO_DEPS += "xf86driproto dri2proto" DEPENDS += "font-util" -SRC_URI += "file://nodolt.patch;patch=1 \ - file://crosscompile.patch;patch=1" +SRC_URI += "file://nodolt.patch \ + file://crosscompile.patch \ + file://libdrm-poulsbo.patch" # Misc build failure for master HEAD -SRC_URI += "file://fix_open_max_preprocessor_error.patch;patch=1" +SRC_URI += "file://fix_open_max_preprocessor_error.patch" EXTRA_OECONF += "--enable-dri --enable-dri2 --enable-dga --enable-glx" DEPENDS += "psb-firmware xpsb-glx psb-kernel-source libdrm-poulsbo libva" -COMPATBILE_MACHINE = "emenlow" +COMPATIBLE_MACHINE = "emenlow" |