xserver-xf86-dri-lite: upgrade to 1.8.99.904 (1.9 RC4)
Also update the releated x driver PR value, since they need recompile to match the new xserver ABI Signed-off-by: Yu Ke <ke.yu@intel.com>
This commit is contained in:
parent
3e9592e9da
commit
f7a98901d9
|
@ -129,7 +129,7 @@ PREFERRED_VERSION_xproxymanagementprotocol ?= "1.0.3"
|
||||||
PREFERRED_VERSION_xrandr ?= "1.3.2"
|
PREFERRED_VERSION_xrandr ?= "1.3.2"
|
||||||
PREFERRED_VERSION_xrdb ?= "1.0.5"
|
PREFERRED_VERSION_xrdb ?= "1.0.5"
|
||||||
PREFERRED_VERSION_xserver-kdrive ?= "1.7.99.2"
|
PREFERRED_VERSION_xserver-kdrive ?= "1.7.99.2"
|
||||||
PREFERRED_VERSION_xserver-xf86-dri-lite ?= "1.7.99.2"
|
PREFERRED_VERSION_xserver-xf86-dri-lite ?= "1.8.99.904"
|
||||||
PREFERRED_VERSION_xset ?= "1.1.0"
|
PREFERRED_VERSION_xset ?= "1.1.0"
|
||||||
PREFERRED_VERSION_xtrans ?= "1.2.5"
|
PREFERRED_VERSION_xtrans ?= "1.2.5"
|
||||||
PREFERRED_VERSION_xtrans-native ?= "1.2.5"
|
PREFERRED_VERSION_xtrans-native ?= "1.2.5"
|
||||||
|
|
|
@ -4,4 +4,4 @@ DESCRIPTION = "X.Org X server -- evdev input driver"
|
||||||
|
|
||||||
LIC_FILES_CHKSUM = "file://COPYING;md5=ebf4ad82cd33b1432eacb1798a43c092"
|
LIC_FILES_CHKSUM = "file://COPYING;md5=ebf4ad82cd33b1432eacb1798a43c092"
|
||||||
|
|
||||||
PR = "r0"
|
PR = "r1"
|
||||||
|
|
|
@ -4,3 +4,4 @@ DESCRIPTION = "X.Org X server -- keyboard input driver"
|
||||||
|
|
||||||
LIC_FILES_CHKSUM = "file://COPYING;md5=eae2c98cbb8c60401893ff9313ff3826"
|
LIC_FILES_CHKSUM = "file://COPYING;md5=eae2c98cbb8c60401893ff9313ff3826"
|
||||||
|
|
||||||
|
PR = "r1"
|
||||||
|
|
|
@ -7,6 +7,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4641deddaa80fe7ca88e944e1fd94a94"
|
||||||
DEPENDS += "virtual/libx11 libxvmc drm glproto \
|
DEPENDS += "virtual/libx11 libxvmc drm glproto \
|
||||||
virtual/libgl xineramaproto libpciaccess"
|
virtual/libgl xineramaproto libpciaccess"
|
||||||
|
|
||||||
PR = "r0"
|
PR = "r1"
|
||||||
|
|
||||||
COMPATIBLE_HOST = '(i.86.*-linux)'
|
COMPATIBLE_HOST = '(i.86.*-linux)'
|
||||||
|
|
|
@ -30,7 +30,7 @@ FILES_${PN}-dbg += "${libdir}/xorg/modules/.debug \
|
||||||
${libdir}/xorg/modules/*/*/.debug \
|
${libdir}/xorg/modules/*/*/.debug \
|
||||||
"
|
"
|
||||||
|
|
||||||
SRC_URI += "file://macro_tweak.patch;patch=1"
|
SRC_URI += "file://macro_tweak.patch"
|
||||||
|
|
||||||
do_install_append () {
|
do_install_append () {
|
||||||
install -d ${D}/${libdir}/X11/fonts/
|
install -d ${D}/${libdir}/X11/fonts/
|
||||||
|
|
|
@ -1,19 +1,20 @@
|
||||||
Index: xorg-server-1.7.99.2/configure.ac
|
diff --git a/configure.ac b/configure.ac
|
||||||
===================================================================
|
index b3b752c..600500b 100644
|
||||||
--- xorg-server-1.7.99.2.orig/configure.ac 2010-01-29 16:38:49.000000000 +0000
|
--- a/configure.ac
|
||||||
+++ xorg-server-1.7.99.2/configure.ac 2010-01-29 16:42:39.000000000 +0000
|
+++ b/configure.ac
|
||||||
@@ -503,14 +503,10 @@
|
@@ -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 Uses --default-font-path if set, otherwise checks for /etc/X11/fontpath.d,
|
dnl compiling, assume default font path uses standard FONTROOTDIR directories.
|
||||||
dnl otherwise uses standard subdirectories of FONTROOTDIR
|
DEFAULT_FONT_PATH="${FONTMISCDIR}/,${FONTTTFDIR}/,${FONTOTFDIR}/,${FONTTYPE1DIR}/,${FONT100DPIDIR}/,${FONT75DPIDIR}/"
|
||||||
-AC_CHECK_FILE([${sysconfdir}/X11/fontpath.d],
|
-if test "$cross_compiling" != yes; then
|
||||||
- [DEFAULT_FONT_PATH='catalogue:${sysconfdir}/X11/fontpath.d'],
|
- 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
|
||||||
case $host_os in
|
+ case $host_os in
|
||||||
darwin*) DEFAULT_FONT_PATH="${DEFAULT_FONT_PATH},/Library/Fonts,/System/Library/Fonts" ;;
|
darwin*) DEFAULT_FONT_PATH="${DEFAULT_FONT_PATH},/Library/Fonts,/System/Library/Fonts" ;;
|
||||||
esac
|
- esac])
|
||||||
- ])
|
-fi
|
||||||
|
+ esac
|
||||||
AC_ARG_WITH(default-font-path, AS_HELP_STRING([--with-default-font-path=PATH], [Comma separated list of font dirs]),
|
AC_ARG_WITH(default-font-path, AS_HELP_STRING([--with-default-font-path=PATH], [Comma separated list of font dirs]),
|
||||||
[ FONTPATH="$withval" ],
|
[ FONTPATH="$withval" ],
|
||||||
[ FONTPATH="${DEFAULT_FONT_PATH}" ])
|
[ FONTPATH="${DEFAULT_FONT_PATH}" ])
|
||||||
|
|
|
@ -0,0 +1,28 @@
|
||||||
|
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.
|
||||||
|
|
||||||
|
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
|
|
@ -1,18 +1,20 @@
|
||||||
require xserver-xf86-dri-lite.inc
|
require xserver-xf86-dri-lite.inc
|
||||||
|
|
||||||
PE = "1"
|
LIC_FILES_CHKSUM = "file://COPYING;md5=3dd2bbe3563837f80ed8926b06c1c353"
|
||||||
PR = "r3"
|
|
||||||
|
|
||||||
PROTO_DEPS += "xf86driproto dri2proto"
|
PROTO_DEPS += "xf86driproto dri2proto"
|
||||||
|
|
||||||
DEPENDS += "font-util"
|
DEPENDS += "font-util"
|
||||||
|
|
||||||
SRC_URI += "file://nodolt.patch;patch=1 \
|
PE = "1"
|
||||||
file://crosscompile.patch;patch=1"
|
PR = "r0"
|
||||||
|
|
||||||
|
SRC_URI += "file://nodolt.patch \
|
||||||
|
file://crosscompile.patch"
|
||||||
# file://libdri-xinerama-symbol.patch;patch=1 \
|
# file://libdri-xinerama-symbol.patch;patch=1 \
|
||||||
# file://xserver-boottime.patch;patch=1"
|
# file://xserver-boottime.patch;patch=1"
|
||||||
|
|
||||||
# Misc build failure for master HEAD
|
# 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"
|
EXTRA_OECONF += "--enable-dri --enable-dri2"
|
Loading…
Reference in New Issue