From a7ca3b42756f9467fde3f1c7e7a5827b92b80c05 Mon Sep 17 00:00:00 2001 From: Saul Wold Date: Wed, 30 Nov 2011 21:12:30 -0800 Subject: xserver-xorg*: Update to 1.11.2 (From OE-Core rev: e2a427ef463b2892c17d0007619eb6b08a050414) Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- .../xorg-xserver/xserver-xorg-1.11.1.inc | 9 -------- .../xserver-xorg-1.11.1/crosscompile.patch | 22 ------------------- .../fix_open_max_preprocessor_error.patch | 15 ------------- .../xserver-xorg-1.11.1/macro_tweak.patch | 25 ---------------------- .../xorg-xserver/xserver-xorg-1.11.2.inc | 10 +++++++++ .../xserver-xorg-1.11.2/crosscompile.patch | 22 +++++++++++++++++++ .../fix_open_max_preprocessor_error.patch | 15 +++++++++++++ .../xserver-xorg-1.11.2/macro_tweak.patch | 25 ++++++++++++++++++++++ .../xorg-xserver/xserver-xorg-lite_1.11.1.bb | 4 ---- .../xorg-xserver/xserver-xorg-lite_1.11.2.bb | 4 ++++ .../xorg-xserver/xserver-xorg_1.11.1.bb | 2 -- .../xorg-xserver/xserver-xorg_1.11.2.bb | 2 ++ 12 files changed, 78 insertions(+), 77 deletions(-) delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.1.inc delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.1/crosscompile.patch delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.1/fix_open_max_preprocessor_error.patch delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.1/macro_tweak.patch create mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc create mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2/crosscompile.patch create mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2/fix_open_max_preprocessor_error.patch create mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2/macro_tweak.patch delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg-lite_1.11.1.bb create mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg-lite_1.11.2.bb delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg_1.11.1.bb create mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg_1.11.2.bb diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.1.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.1.inc deleted file mode 100644 index 8b0808d8de..0000000000 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.1.inc +++ /dev/null @@ -1,9 +0,0 @@ -SRC_URI += "file://crosscompile.patch" - -# Misc build failure for master HEAD -SRC_URI += "file://fix_open_max_preprocessor_error.patch" - -PR = "r2" - -SRC_URI[md5sum] = "4cdf54dc569b6a5548257c93a45dcd3d" -SRC_URI[sha256sum] = "c069c177d9a80bca2ee1d49aa1af6d9f996c83e4ff12393cab2ca3f8817276f6" diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.1/crosscompile.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.1/crosscompile.patch deleted file mode 100644 index 2f98bb8c89..0000000000 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.1/crosscompile.patch +++ /dev/null @@ -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}" ]) diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.1/fix_open_max_preprocessor_error.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.1/fix_open_max_preprocessor_error.patch deleted file mode 100644 index 2f629724c9..0000000000 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.1/fix_open_max_preprocessor_error.patch +++ /dev/null @@ -1,15 +0,0 @@ -Upstream-Status: Pending - -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 diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.1/macro_tweak.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.1/macro_tweak.patch deleted file mode 100644 index ec0eea6ca2..0000000000 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.1/macro_tweak.patch +++ /dev/null @@ -1,25 +0,0 @@ -This is the revised version of files/macro_tweak.patch for -xorg-server 1.8.99.904 and newer. - -Upstream-Status: Pending - -Signed-off-by: Yu Ke - -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 diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc new file mode 100644 index 0000000000..be3c243c8a --- /dev/null +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc @@ -0,0 +1,10 @@ +SRC_URI += "file://crosscompile.patch" + +# Misc build failure for master HEAD +SRC_URI += "file://fix_open_max_preprocessor_error.patch" + +SRC_URI[md5sum] = "8796fff441e5435ee36a72579008af24" +SRC_URI[sha256sum] = "fa415decf02027ca278b06254ccfbcceba2a83c2741405257ebf749da4a73cf2" + +PR = "r0" + diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2/crosscompile.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2/crosscompile.patch new file mode 100644 index 0000000000..2f98bb8c89 --- /dev/null +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2/crosscompile.patch @@ -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}" ]) diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2/fix_open_max_preprocessor_error.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2/fix_open_max_preprocessor_error.patch new file mode 100644 index 0000000000..2f629724c9 --- /dev/null +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2/fix_open_max_preprocessor_error.patch @@ -0,0 +1,15 @@ +Upstream-Status: Pending + +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 diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2/macro_tweak.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2/macro_tweak.patch new file mode 100644 index 0000000000..ec0eea6ca2 --- /dev/null +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2/macro_tweak.patch @@ -0,0 +1,25 @@ +This is the revised version of files/macro_tweak.patch for +xorg-server 1.8.99.904 and newer. + +Upstream-Status: Pending + +Signed-off-by: Yu Ke + +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 diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite_1.11.1.bb b/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite_1.11.1.bb deleted file mode 100644 index ec29b21d9b..0000000000 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite_1.11.1.bb +++ /dev/null @@ -1,4 +0,0 @@ -require xserver-xorg-lite.inc -require xserver-xorg-${PV}.inc - -FILESEXTRAPATHS_append := "${THISDIR}/xserver-xorg:${THISDIR}/xserver-xorg-${PV}:" diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite_1.11.2.bb b/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite_1.11.2.bb new file mode 100644 index 0000000000..ec29b21d9b --- /dev/null +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite_1.11.2.bb @@ -0,0 +1,4 @@ +require xserver-xorg-lite.inc +require xserver-xorg-${PV}.inc + +FILESEXTRAPATHS_append := "${THISDIR}/xserver-xorg:${THISDIR}/xserver-xorg-${PV}:" diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.11.1.bb b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.11.1.bb deleted file mode 100644 index 0f94fe29c5..0000000000 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.11.1.bb +++ /dev/null @@ -1,2 +0,0 @@ -require xserver-xorg.inc -require xserver-xorg-${PV}.inc diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.11.2.bb b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.11.2.bb new file mode 100644 index 0000000000..0f94fe29c5 --- /dev/null +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.11.2.bb @@ -0,0 +1,2 @@ +require xserver-xorg.inc +require xserver-xorg-${PV}.inc -- cgit v1.2.3-54-g00ecf