mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-03-06 23:39:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

xserver-xorg: move patches to xserver-xf86-dri-lite-1.11.1 and use same directory from xserver-xf86-lite recipe

Browse Source 
* FILESEXTRAPATHS needs to be in xserver-xf86-lite_1.11.1
  because in .inc we don't have ${PV} expanded yet
* crosscompile.patch macro_tweak.patch were identical
* fix_open_max_preprocessor_error.patch has only different header
  # $ diff xserver-xorg/fix_open_max_preprocessor_error.patch xserver-xorg-dri/fix_open_max_preprocessor_error.patch
  1c1
  < Upstream-Status: Pending
  ---
  > Upstream-Status: Inappropriate [embedded specific]

(From OE-Core rev: aaa137f54c246b61a94b62a731de67f09e688a2a)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Martin Jansa
2011-10-07 17:07:09 +02:00
committed by Richard Purdie
parent 4981c2a793
commit 4c80e07e6c
7 changed files with 3 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
meta/recipes-graphics/xorg-xserver/xserver-xorg-lite/crosscompile.patch → meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.1/crosscompile.patch
View File

0
meta/recipes-graphics/xorg-xserver/xserver-xorg-lite/fix_open_max_preprocessor_error.patch → meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.1/fix_open_max_preprocessor_error.patch
View File

7
meta/recipes-graphics/xorg-xserver/xserver-xorg-lite/macro_tweak.patch → meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.1/macro_tweak.patch
View File

@@ -1,10 +1,5 @@
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-xorg(-lite). Once they
are all upgraded to 1.8.99.904, the the files/macro_tweak.patch
can be safely replace by this patch.
xorg-server 1.8.99.904 and newer.
Upstream-Status: Pending

2
meta/recipes-graphics/xorg-xserver/xserver-xorg-lite_1.11.1.bb
View File

@@ -1,2 +1,4 @@
require xserver-xorg-lite.inc
require xserver-xorg-${PV}.inc
FILESEXTRAPATHS_append := "${THISDIR}/xserver-xorg:${THISDIR}/xserver-xorg-${PV}:"

22
meta/recipes-graphics/xorg-xserver/xserver-xorg/crosscompile.patch
View File

@@ -1,22 +0,0 @@
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}" ])

15
meta/recipes-graphics/xorg-xserver/xserver-xorg/fix_open_max_preprocessor_error.patch
View File

@@ -1,15 +0,0 @@
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

30
meta/recipes-graphics/xorg-xserver/xserver-xorg/macro_tweak.patch
View File

@@ -1,30 +0,0 @@
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-xorg(-lite). 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