mirror of
git://git.yoctoproject.org/meta-intel.git
synced 2025-07-19 21:09:03 +02:00
meta-intel: add xserver-xf86-dri-lite_1.9.3 to common
emgd 1.6 requires xserver 1.9.3, which is no longer in meta, and it needs to be shared by multiple BSPs, so add it to common. Signed-off-by: Tom Zanussi <tom.zanussi@intel.com> Acked-by: Darren Hart <dvhart@linux.intel.com>
This commit is contained in:
parent
9902e2fee4
commit
7c19e43c9c
|
@ -0,0 +1,22 @@
|
||||||
|
Upstream-Status: Inappropriate [configuration]
|
||||||
|
|
||||||
|
diff --git a/configure.ac b/configure.ac
|
||||||
|
index b3b752c..600500b 100644
|
||||||
|
--- a/configure.ac
|
||||||
|
+++ b/configure.ac
|
||||||
|
@@ -523,13 +523,9 @@ dnl Uses --default-font-path if set, otherwise checks for /etc/X11/fontpath.d,
|
||||||
|
dnl otherwise uses standard subdirectories of FONTROOTDIR. When cross
|
||||||
|
dnl compiling, assume default font path uses standard FONTROOTDIR directories.
|
||||||
|
DEFAULT_FONT_PATH="${FONTMISCDIR}/,${FONTTTFDIR}/,${FONTOTFDIR}/,${FONTTYPE1DIR}/,${FONT100DPIDIR}/,${FONT75DPIDIR}/"
|
||||||
|
-if test "$cross_compiling" != yes; then
|
||||||
|
- AC_CHECK_FILE([${sysconfdir}/X11/fontpath.d],
|
||||||
|
- [DEFAULT_FONT_PATH='catalogue:${sysconfdir}/X11/fontpath.d'],
|
||||||
|
- [case $host_os in
|
||||||
|
+ case $host_os in
|
||||||
|
darwin*) DEFAULT_FONT_PATH="${DEFAULT_FONT_PATH},/Library/Fonts,/System/Library/Fonts" ;;
|
||||||
|
- esac])
|
||||||
|
-fi
|
||||||
|
+ 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}" ])
|
|
@ -0,0 +1,15 @@
|
||||||
|
Upstream-Status: Inappropriate [embedded specific]
|
||||||
|
|
||||||
|
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
|
|
@ -0,0 +1,30 @@
|
||||||
|
This is the revised version of files/macro_tweak.patch for
|
||||||
|
xorg-server 1.8.99.904.
|
||||||
|
|
||||||
|
the files/macro_tweak.patch can not removed now since it is used by
|
||||||
|
xserver-kdrive-1.7.99.2 and xserver-xf86-lite_1.7.99.2. Once they
|
||||||
|
are all upgraded to 1.8.99.904, the the files/macro_tweak.patch
|
||||||
|
can be safely replace by this patch.
|
||||||
|
|
||||||
|
Upstream-Status: Pending
|
||||||
|
|
||||||
|
Signed-off-by: Yu Ke <ke.yu@intel.com>
|
||||||
|
|
||||||
|
diff --git a/xorg-server.m4 b/xorg-server.m4
|
||||||
|
index bdecf62..040fdb8 100644
|
||||||
|
--- a/xorg-server.m4
|
||||||
|
+++ b/xorg-server.m4
|
||||||
|
@@ -28,10 +28,12 @@ dnl
|
||||||
|
# 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],[
|
||||||
|
AC_REQUIRE([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
|
|
@ -0,0 +1,14 @@
|
||||||
|
Upstream-Status: Inappropriate [configuration]
|
||||||
|
|
||||||
|
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
|
|
@ -0,0 +1,19 @@
|
||||||
|
require recipes-graphics/xorg-xserver/xserver-xf86-dri-lite.inc
|
||||||
|
|
||||||
|
PROTO_DEPS += "xf86driproto dri2proto"
|
||||||
|
|
||||||
|
DEPENDS += "font-util"
|
||||||
|
|
||||||
|
PE = "1"
|
||||||
|
PR = "r0"
|
||||||
|
|
||||||
|
SRC_URI += "file://nodolt.patch \
|
||||||
|
file://crosscompile.patch"
|
||||||
|
|
||||||
|
# Misc build failure for master HEAD
|
||||||
|
SRC_URI += "file://fix_open_max_preprocessor_error.patch"
|
||||||
|
|
||||||
|
SRC_URI[md5sum] = "5bef6839a76d029204ab31aa2fcb5201"
|
||||||
|
SRC_URI[sha256sum] = "864831f51e841ff37f2445d1c85b86b559c8860a435fb496aead4f256a2b141d"
|
||||||
|
|
||||||
|
EXTRA_OECONF += "--enable-dri --enable-dri2 --enable-dga"
|
Loading…
Reference in New Issue
Block a user