[OE-core] [PATCH v4 08/12] xserver-xorg: upgrade to 1.13.0

2012-11-15 Thread Laurentiu Palcu 
The patch contains several aditional changes:
 * removed one backported patch (included in the new release);
 * changed mips64-compiler.patch to apply properly;
 * licence checksum for COPYING file changed: some copyright years have
   been changed;
 * bump PR in xorg-driver-common.inc so that all input/video drivers
   get rebuilt. That's becaue the ABI changed;

The following external modules are now built-in:
 * DBE
 * DRI2
 * DRI
 * RECORD

The extmod module was completely removed.

Signed-off-by: Laurentiu Palcu laurentiu.pa...@intel.com
---
 meta/conf/machine/include/ia32-base.inc|5 +-
 .../xorg-driver/xorg-driver-common.inc |2 +-
 .../xserver-xorg-1.11.4/crosscompile.patch |   22 --
 .../fix_open_max_preprocessor_error.patch  |   15 -
 .../xserver-xorg-1.11.4/macro_tweak.patch  |   25 ---
 .../xserver-xorg-1.11.4/mips64-compiler.patch  |   29 
 .../xserver-xorg-1.11.4/pkgconfig-deps.patch   |   70 
 .../xserver-xorg-1.13.0/crosscompile.patch |   22 ++
 .../fix_open_max_preprocessor_error.patch  |   15 +
 .../xserver-xorg-1.13.0/macro_tweak.patch  |   25 +++
 .../xserver-xorg-1.13.0/mips64-compiler.patch  |   29 
 .../recipes-graphics/xorg-xserver/xserver-xorg.inc |   32 +
 .../xorg-xserver/xserver-xorg_1.11.4.bb|   13 
 .../xorg-xserver/xserver-xorg_1.13.0.bb|   12 
 14 files changed, 125 insertions(+), 191 deletions(-)
 delete mode 100644 
meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.4/crosscompile.patch
 delete mode 100644 
meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.4/fix_open_max_preprocessor_error.patch
 delete mode 100644 
meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.4/macro_tweak.patch
 delete mode 100644 
meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.4/mips64-compiler.patch
 delete mode 100644 
meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.4/pkgconfig-deps.patch
 create mode 100644 
meta/recipes-graphics/xorg-xserver/xserver-xorg-1.13.0/crosscompile.patch
 create mode 100644 
meta/recipes-graphics/xorg-xserver/xserver-xorg-1.13.0/fix_open_max_preprocessor_error.patch
 create mode 100644 
meta/recipes-graphics/xorg-xserver/xserver-xorg-1.13.0/macro_tweak.patch
 create mode 100644 
meta/recipes-graphics/xorg-xserver/xserver-xorg-1.13.0/mips64-compiler.patch
 delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg_1.11.4.bb
 create mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg_1.13.0.bb

diff --git a/meta/conf/machine/include/ia32-base.inc 
b/meta/conf/machine/include/ia32-base.inc
index 4b10183..c2d267a 100644
--- a/meta/conf/machine/include/ia32-base.inc
+++ b/meta/conf/machine/include/ia32-base.inc
@@ -33,11 +33,8 @@ XSERVER_IA32_BASE = xserver-xorg \
xf86-input-synaptics \

 
-XSERVER_IA32_EXT = xserver-xorg-extension-dri \
-   xserver-xorg-extension-dri2 \
+XSERVER_IA32_EXT = 
xserver-xorg-extension-glx \
-   xserver-xorg-extension-extmod \
-   xserver-xorg-extension-dbe \
xserver-xorg-module-libint10 \

 
diff --git a/meta/recipes-graphics/xorg-driver/xorg-driver-common.inc 
b/meta/recipes-graphics/xorg-driver/xorg-driver-common.inc
index f9f25ff..4c9b47d 100644
--- a/meta/recipes-graphics/xorg-driver/xorg-driver-common.inc
+++ b/meta/recipes-graphics/xorg-driver/xorg-driver-common.inc
@@ -5,7 +5,7 @@ SECTION = x11/drivers
 LICENSE = MIT-X
 
 PE = 2
-INC_PR = r18
+INC_PR = r19
 
 DEPENDS = virtual/xserver xproto randrproto util-macros
 
diff --git 
a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.4/crosscompile.patch 
b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.4/crosscompile.patch
deleted file mode 100644
index 2f98bb8..000
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.4/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],

Re: [OE-core] [PATCH v4 08/12] xserver-xorg: upgrade to 1.13.0

2012-11-15 Thread Laurentiu Palcu 
v4:
 * bumped PR xorg-driver-common.inc to get the the input/video drivers
rebuilt.

On 11/15/2012 01:07 PM, Laurentiu Palcu wrote:
 The patch contains several aditional changes:
  * removed one backported patch (included in the new release);
  * changed mips64-compiler.patch to apply properly;
  * licence checksum for COPYING file changed: some copyright years have
been changed;
  * bump PR in xorg-driver-common.inc so that all input/video drivers
get rebuilt. That's becaue the ABI changed;
 
 The following external modules are now built-in:
  * DBE
  * DRI2
  * DRI
  * RECORD
 
 The extmod module was completely removed.
 
 Signed-off-by: Laurentiu Palcu laurentiu.pa...@intel.com
 ---
  meta/conf/machine/include/ia32-base.inc|5 +-
  .../xorg-driver/xorg-driver-common.inc |2 +-
  .../xserver-xorg-1.11.4/crosscompile.patch |   22 --
  .../fix_open_max_preprocessor_error.patch  |   15 -
  .../xserver-xorg-1.11.4/macro_tweak.patch  |   25 ---
  .../xserver-xorg-1.11.4/mips64-compiler.patch  |   29 
  .../xserver-xorg-1.11.4/pkgconfig-deps.patch   |   70 
 
  .../xserver-xorg-1.13.0/crosscompile.patch |   22 ++
  .../fix_open_max_preprocessor_error.patch  |   15 +
  .../xserver-xorg-1.13.0/macro_tweak.patch  |   25 +++
  .../xserver-xorg-1.13.0/mips64-compiler.patch  |   29 
  .../recipes-graphics/xorg-xserver/xserver-xorg.inc |   32 +
  .../xorg-xserver/xserver-xorg_1.11.4.bb|   13 
  .../xorg-xserver/xserver-xorg_1.13.0.bb|   12 
  14 files changed, 125 insertions(+), 191 deletions(-)
  delete mode 100644 
 meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.4/crosscompile.patch
  delete mode 100644 
 meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.4/fix_open_max_preprocessor_error.patch
  delete mode 100644 
 meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.4/macro_tweak.patch
  delete mode 100644 
 meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.4/mips64-compiler.patch
  delete mode 100644 
 meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.4/pkgconfig-deps.patch
  create mode 100644 
 meta/recipes-graphics/xorg-xserver/xserver-xorg-1.13.0/crosscompile.patch
  create mode 100644 
 meta/recipes-graphics/xorg-xserver/xserver-xorg-1.13.0/fix_open_max_preprocessor_error.patch
  create mode 100644 
 meta/recipes-graphics/xorg-xserver/xserver-xorg-1.13.0/macro_tweak.patch
  create mode 100644 
 meta/recipes-graphics/xorg-xserver/xserver-xorg-1.13.0/mips64-compiler.patch
  delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg_1.11.4.bb
  create mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg_1.13.0.bb
 
 diff --git a/meta/conf/machine/include/ia32-base.inc 
 b/meta/conf/machine/include/ia32-base.inc
 index 4b10183..c2d267a 100644
 --- a/meta/conf/machine/include/ia32-base.inc
 +++ b/meta/conf/machine/include/ia32-base.inc
 @@ -33,11 +33,8 @@ XSERVER_IA32_BASE = xserver-xorg \
 xf86-input-synaptics \
 
  
 -XSERVER_IA32_EXT = xserver-xorg-extension-dri \
 -   xserver-xorg-extension-dri2 \
 +XSERVER_IA32_EXT = 
 xserver-xorg-extension-glx \
 -   xserver-xorg-extension-extmod \
 -   xserver-xorg-extension-dbe \
 xserver-xorg-module-libint10 \
 
  
 diff --git a/meta/recipes-graphics/xorg-driver/xorg-driver-common.inc 
 b/meta/recipes-graphics/xorg-driver/xorg-driver-common.inc
 index f9f25ff..4c9b47d 100644
 --- a/meta/recipes-graphics/xorg-driver/xorg-driver-common.inc
 +++ b/meta/recipes-graphics/xorg-driver/xorg-driver-common.inc
 @@ -5,7 +5,7 @@ SECTION = x11/drivers
  LICENSE = MIT-X
  
  PE = 2
 -INC_PR = r18
 +INC_PR = r19
  
  DEPENDS = virtual/xserver xproto randrproto util-macros
  
 diff --git 
 a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.4/crosscompile.patch 
 b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.4/crosscompile.patch
 deleted file mode 100644
 index 2f98bb8..000
 --- 
 a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.4/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
 -