This email list is read-only. Emails sent to this list will be discarded
----------------------------------
.../xorg-driver/xf86-input-mouse/unbreak.patch | 19 +++++++++++++++++++
meta/packages/xorg-driver/xf86-input-mouse_git.bb | 4 +++-
meta/packages/xorg-xserver/files/macro_tweak.patch | 18 ++++++++++++++++++
meta/packages/xorg-xserver/xserver-xf86-common.inc | 9 +--------
.../xorg-xserver/xserver-xf86-dri-lite_1.5.0.bb | 2 +-
.../xorg-xserver/xserver-xf86-dri-lite_git.bb | 2 +-
.../xorg-xserver/xserver-xf86-dri2-lite_git.bb | 2 +-
.../xorg-xserver/xserver-xf86-lite_1.5.0.bb | 2 +-
8 files changed, 45 insertions(+), 13 deletions(-)
New commits:
commit 9ffb17080fa82aa550b304be77242e65c42802e1
Author: Richard Purdie <[EMAIL PROTECTED]>
Date: Wed Nov 5 00:05:09 2008 +0000
xf86-input-mouse: Fix header files included
commit d9dfbf4e1295d5fc6f7233ae774a78633e887ded
Author: Richard Purdie <[EMAIL PROTECTED]>
Date: Wed Nov 5 00:03:56 2008 +0000
xserver-x86: Fix m4 autoconf macro
Diff in this email is a maximum of 400 lines.
diff --git a/meta/packages/xorg-driver/xf86-input-mouse/unbreak.patch
b/meta/packages/xorg-driver/xf86-input-mouse/unbreak.patch
new file mode 100644
index 0000000..665b320
--- /dev/null
+++ b/meta/packages/xorg-driver/xf86-input-mouse/unbreak.patch
@@ -0,0 +1,19 @@
+Unbreak the linux mouse driver by using config.h
+
+RP - 4/11/07
+
+Index: git/src/lnx_mouse.c
+===================================================================
+--- git.orig/src/lnx_mouse.c 2008-11-04 23:46:05.000000000 +0000
++++ git/src/lnx_mouse.c 2008-11-04 23:46:15.000000000 +0000
+@@ -3,8 +3,8 @@
+ * Copyright 1999 by The XFree86 Project, Inc.
+ */
+
+-#ifdef HAVE_XORG_CONFIG_H
+-#include <xorg-config.h>
++#ifdef HAVE_CONFIG_H
++#include <config.h>
+ #endif
+
+ #include <X11/X.h>
diff --git a/meta/packages/xorg-driver/xf86-input-mouse_git.bb
b/meta/packages/xorg-driver/xf86-input-mouse_git.bb
index e1b1678..5503e56 100644
--- a/meta/packages/xorg-driver/xf86-input-mouse_git.bb
+++ b/meta/packages/xorg-driver/xf86-input-mouse_git.bb
@@ -3,7 +3,9 @@ require xf86-input-common.inc
DESCRIPTION = "X.Org X server -- mouse input driver"
PV = "1.3.0+git${SRCREV}"
+PR = "r2"
-SRC_URI =
"git://anongit.freedesktop.org/git/xorg/driver/xf86-input-mouse;protocol=git"
+SRC_URI =
"git://anongit.freedesktop.org/git/xorg/driver/xf86-input-mouse;protocol=git \
+ file://unbreak.patch;patch=1"
S = "${WORKDIR}/git"
diff --git a/meta/packages/xorg-xserver/files/macro_tweak.patch
b/meta/packages/xorg-xserver/files/macro_tweak.patch
new file mode 100644
index 0000000..6998adf
--- /dev/null
+++ b/meta/packages/xorg-xserver/files/macro_tweak.patch
@@ -0,0 +1,18 @@
+Index: xorg-server-1.5.0/xorg-server.m4
+===================================================================
+--- xorg-server-1.5.0.orig/xorg-server.m4 2007-05-29 20:36:51.000000000
+0100
++++ xorg-server-1.5.0/xorg-server.m4 2008-11-04 23:56:55.000000000 +0000
+@@ -28,9 +28,12 @@
+ # 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],[
++ 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/packages/xorg-xserver/xserver-xf86-common.inc
b/meta/packages/xorg-xserver/xserver-xf86-common.inc
index 17d88bb..d31e97a 100644
--- a/meta/packages/xorg-xserver/xserver-xf86-common.inc
+++ b/meta/packages/xorg-xserver/xserver-xf86-common.inc
@@ -31,14 +31,7 @@ FILES_${PN}-dbg += "${libdir}/xorg/modules/.debug \
CONFFILES_${PN} += "${sysconfdir}/X11/xorg.conf"
-# xorg-server.m4 contains a macro used by the xf86-*-* drivers to check for
-# server extensions. The problem is that it modifies CFLAGS during the drivers
-# ./configure with -I`pkg-config --variable=sdkdir xorg-server` and the sdkdir
-# variable doesn't point into the staging area and so causes
-# "CROSS COMPILE Badness" warnings.
-do_configure_prepend () {
- sed -i "s|\`pkg-config --variable=sdkdir
xorg-server\`|${STAGING_DIR}/${HOST_SYS}/\`pkg-config --variable=sdkdir
xorg-server\`|" xorg-server.m4
-}
+SRC_URI += "file://macro_tweak.patch;patch=1"
do_stage() {
autotools_stage_all
diff --git a/meta/packages/xorg-xserver/xserver-xf86-dri-lite_1.5.0.bb
b/meta/packages/xorg-xserver/xserver-xf86-dri-lite_1.5.0.bb
index c9bd3f9..6144f75 100644
--- a/meta/packages/xorg-xserver/xserver-xf86-dri-lite_1.5.0.bb
+++ b/meta/packages/xorg-xserver/xserver-xf86-dri-lite_1.5.0.bb
@@ -1,7 +1,7 @@
require xserver-xf86-dri-lite.inc
PE = "1"
-PR = "r3"
+PR = "r4"
PROTO_DEPS += "xf86driproto"
diff --git a/meta/packages/xorg-xserver/xserver-xf86-dri-lite_git.bb
b/meta/packages/xorg-xserver/xserver-xf86-dri-lite_git.bb
index e870690..1d5c218 100644
--- a/meta/packages/xorg-xserver/xserver-xf86-dri-lite_git.bb
+++ b/meta/packages/xorg-xserver/xserver-xf86-dri-lite_git.bb
@@ -1,7 +1,7 @@
require xserver-xf86-dri-lite.inc
PE = "1"
-PR = "r3"
+PR = "r4"
PV = "1.5.99.1+git${SRCREV}"
PROTO_DEPS += "xf86driproto"
diff --git a/meta/packages/xorg-xserver/xserver-xf86-dri2-lite_git.bb
b/meta/packages/xorg-xserver/xserver-xf86-dri2-lite_git.bb
index 694979a..029efa3 100644
--- a/meta/packages/xorg-xserver/xserver-xf86-dri2-lite_git.bb
+++ b/meta/packages/xorg-xserver/xserver-xf86-dri2-lite_git.bb
@@ -1,6 +1,6 @@
require xserver-xf86-dri-lite.inc
-PR = "r0"
+PR = "r1"
PV = "1.5.99.1+git${SRCREV}"
PROTO_DEPS += "dri2proto"
diff --git a/meta/packages/xorg-xserver/xserver-xf86-lite_1.5.0.bb
b/meta/packages/xorg-xserver/xserver-xf86-lite_1.5.0.bb
index d16e7b0..15e7763 100644
--- a/meta/packages/xorg-xserver/xserver-xf86-lite_1.5.0.bb
+++ b/meta/packages/xorg-xserver/xserver-xf86-lite_1.5.0.bb
@@ -1,6 +1,6 @@
require xserver-xf86-lite.inc
-PR = "r0"
+PR = "r1"
SRC_URI += "file://drmfix.patch;patch=1 \
file://libdri-xinerama-symbol.patch;patch=1 "
_______________________________________________
Commits mailing list
[email protected]
https://lists.moblin.org/mailman/listinfo/commits
