* [PATCH 0/5] recipes upgrade: xserver, sqlite3, xf86-video-intel
@ 2011-05-11 7:27 Yu Ke
2011-05-11 7:27 ` [PATCH 1/5] xf86-video-intel: upgrade from 2.14.0 to 2.15.0 Yu Ke
` (5 more replies)
0 siblings, 6 replies; 7+ messages in thread
From: Yu Ke @ 2011-05-11 7:27 UTC (permalink / raw)
To: openembedded-core
From: Yu Ke <ke.yu@intel.com>
Test with qemux86, qemuarm, and atom-pc
Pull URL: git://git.pokylinux.org/poky-contrib.git
Branch: kyu3/upgrade-05-11
Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=kyu3/upgrade-05-11
Thanks,
Yu Ke <ke.yu@intel.com>
---
Yu Ke (5):
xf86-video-intel: upgrade from 2.14.0 to 2.15.0
sqlite: upgrade from 3.7.5 to 3.7.6.2
xserver-xf86-dri-lite: upgrade from 1.9.3 to 1.10.1
xserver-xf86-dri-lite_git: upgrade to 1.10.2 RC1 snapshot
xserver-xf86-lite: upgrade to from 1.7 RC2 to 1.10.1
.../distro/include/preferred-xorg-versions.inc | 4 +-
...-intel_2.14.0.bb => xf86-video-intel_2.15.0.bb} | 6 +-
.../cache-xkbcomp-output-for-fast-start-up.patch | 2 +
.../xserver-xf86-dri-lite/crosscompile.patch | 2 +
.../xserver-xf86-dri-lite/doublefix.patch | 13 -
.../xserver-xf86-dri-lite/drmfix.patch | 13 -
.../xserver-xf86-dri-lite/fix_macros.patch | 21 --
.../xserver-xf86-dri-lite/fix_macros1.patch | 2 +
.../fix_open_max_preprocessor_error.patch | 2 +
.../libdri-xinerama-symbol.patch | 50 ----
.../xserver-xf86-dri-lite/macro_tweak.patch | 2 +
.../xserver-xf86-dri-lite/nodolt.patch | 12 -
.../xorg-server-disable-dri_sarea.patch | 12 -
.../xorg-server-enable-dri2.patch | 23 --
.../xserver-1.5.0-bg-none-root.patch | 156 ------------
.../xserver-DRI2Swapbuffer.patch | 179 --------------
.../xserver-xf86-dri-lite/xserver-boottime.patch | 38 ---
.../xserver-xf86-dri-lite/xserver-no-root-2.patch | 105 --------
.../xorg-xserver/xserver-xf86-dri-lite_1.10.1.bb | 20 ++
.../xorg-xserver/xserver-xf86-dri-lite_1.9.3.bb | 22 --
.../xorg-xserver/xserver-xf86-dri-lite_git.bb | 21 +-
.../xserver-xf86-lite/crosscompile.patch | 35 ++--
.../xorg-xserver/xserver-xf86-lite/drmfix.patch | 13 -
.../xserver-xf86-lite/libdri-xinerama-symbol.patch | 50 ----
.../xserver-xf86-lite/macro_tweak.patch | 30 +++
.../xorg-xserver/xserver-xf86-lite/nodolt.patch | 12 -
...make_sys_c_use_unaligned_access_functions.patch | 256 --------------------
.../xorg-xserver/xserver-xf86-lite_1.10.1.bb | 12 +
.../xorg-xserver/xserver-xf86-lite_1.7.99.2.bb | 12 -
meta/recipes-support/sqlite/sqlite3.inc | 5 -
meta/recipes-support/sqlite/sqlite3/libtool.patch | 25 --
meta/recipes-support/sqlite/sqlite3_3.7.5.bb | 10 -
meta/recipes-support/sqlite/sqlite3_3.7.6.2.bb | 10 +
33 files changed, 113 insertions(+), 1062 deletions(-)
rename meta/recipes-graphics/xorg-driver/{xf86-video-intel_2.14.0.bb => xf86-video-intel_2.15.0.bb} (83%)
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/doublefix.patch
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/drmfix.patch
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/fix_macros.patch
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/libdri-xinerama-symbol.patch
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/nodolt.patch
delete mode 100755 meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/xorg-server-disable-dri_sarea.patch
delete mode 100755 meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/xorg-server-enable-dri2.patch
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/xserver-1.5.0-bg-none-root.patch
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/xserver-DRI2Swapbuffer.patch
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/xserver-boottime.patch
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/xserver-no-root-2.patch
create mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_1.10.1.bb
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_1.9.3.bb
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/drmfix.patch
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/libdri-xinerama-symbol.patch
create mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/macro_tweak.patch
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/nodolt.patch
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/revert_make_sys_c_use_unaligned_access_functions.patch
create mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xf86-lite_1.10.1.bb
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xf86-lite_1.7.99.2.bb
delete mode 100644 meta/recipes-support/sqlite/sqlite3/libtool.patch
delete mode 100644 meta/recipes-support/sqlite/sqlite3_3.7.5.bb
create mode 100644 meta/recipes-support/sqlite/sqlite3_3.7.6.2.bb
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 1/5] xf86-video-intel: upgrade from 2.14.0 to 2.15.0
2011-05-11 7:27 [PATCH 0/5] recipes upgrade: xserver, sqlite3, xf86-video-intel Yu Ke
@ 2011-05-11 7:27 ` Yu Ke
2011-05-11 7:27 ` [PATCH 2/5] sqlite: upgrade from 3.7.5 to 3.7.6.2 Yu Ke
` (4 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Yu Ke @ 2011-05-11 7:27 UTC (permalink / raw)
To: openembedded-core
From: Yu Ke <ke.yu@intel.com>
Signed-off-by: Yu Ke <ke.yu@intel.com>
---
.../distro/include/preferred-xorg-versions.inc | 2 +-
...-intel_2.14.0.bb => xf86-video-intel_2.15.0.bb} | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
rename meta/recipes-graphics/xorg-driver/{xf86-video-intel_2.14.0.bb => xf86-video-intel_2.15.0.bb} (83%)
diff --git a/meta/conf/distro/include/preferred-xorg-versions.inc b/meta/conf/distro/include/preferred-xorg-versions.inc
index da730e6..7afa8c9 100644
--- a/meta/conf/distro/include/preferred-xorg-versions.inc
+++ b/meta/conf/distro/include/preferred-xorg-versions.inc
@@ -145,6 +145,6 @@ PREFERRED_VERSION_xf86-input-evdev ?= "2.6.0"
PREFERRED_VERSION_xf86-input-mouse ?= "1.7.0"
PREFERRED_VERSION_xf86-input-keyboard ?= "1.6.0"
PREFERRED_VERSION_xf86-input-synaptics ?= "1.4.0"
-PREFERRED_VERSION_xf86-video-intel ?= "2.14.0"
+PREFERRED_VERSION_xf86-video-intel ?= "2.15.0"
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.14.0.bb b/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.15.0.bb
similarity index 83%
rename from meta/recipes-graphics/xorg-driver/xf86-video-intel_2.14.0.bb
rename to meta/recipes-graphics/xorg-driver/xf86-video-intel_2.15.0.bb
index 099cf9d..6c9db59 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.14.0.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.15.0.bb
@@ -9,7 +9,7 @@ Infrastructure (DRI)."
LIC_FILES_CHKSUM = "file://COPYING;md5=8730ad58d11c7bbad9a7066d69f7808e"
-PR = "r1"
+PR = "r0"
EXTRA_OECONF += "--disable-xvmc"
@@ -21,5 +21,5 @@ DEPENDS += "virtual/libx11 libxvmc drm xf86driproto glproto \
COMPATIBLE_HOST = '(i.86|x86_64).*-linux'
-SRC_URI[md5sum] = "05f187582aeabda57fcd6f2782cfbf8e"
-SRC_URI[sha256sum] = "e18c37a579a960516e69de5c6f74750ca02208c0e41cf763ae5630c84db507df"
+SRC_URI[md5sum] = "ba56ae395a9769ada1fef2014468bee9"
+SRC_URI[sha256sum] = "c377e1e9ab8b846d7e039acc9105479d5dce6a03f1ddccccf01c8474259c1720"
--
1.7.0.4
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 2/5] sqlite: upgrade from 3.7.5 to 3.7.6.2
2011-05-11 7:27 [PATCH 0/5] recipes upgrade: xserver, sqlite3, xf86-video-intel Yu Ke
2011-05-11 7:27 ` [PATCH 1/5] xf86-video-intel: upgrade from 2.14.0 to 2.15.0 Yu Ke
@ 2011-05-11 7:27 ` Yu Ke
2011-05-11 7:27 ` [PATCH 3/5] xserver-xf86-dri-lite: upgrade from 1.9.3 to 1.10.1 Yu Ke
` (3 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Yu Ke @ 2011-05-11 7:27 UTC (permalink / raw)
To: openembedded-core
From: Yu Ke <ke.yu@intel.com>
- also remove the libtool.patch since it is already in the release version
- update the LIC_FILES_CHKSUM, the license is not changed, just use
sqlite3.h as more appropriate license file. the original sqlite3.c
is actually not point to license content.
Signed-off-by: Yu Ke <ke.yu@intel.com>
---
meta/recipes-support/sqlite/sqlite3.inc | 5 ----
meta/recipes-support/sqlite/sqlite3/libtool.patch | 25 ---------------------
meta/recipes-support/sqlite/sqlite3_3.7.5.bb | 10 --------
meta/recipes-support/sqlite/sqlite3_3.7.6.2.bb | 10 ++++++++
4 files changed, 10 insertions(+), 40 deletions(-)
delete mode 100644 meta/recipes-support/sqlite/sqlite3/libtool.patch
delete mode 100644 meta/recipes-support/sqlite/sqlite3_3.7.5.bb
create mode 100644 meta/recipes-support/sqlite/sqlite3_3.7.6.2.bb
diff --git a/meta/recipes-support/sqlite/sqlite3.inc b/meta/recipes-support/sqlite/sqlite3.inc
index 92c4930..d8ef8dc 100644
--- a/meta/recipes-support/sqlite/sqlite3.inc
+++ b/meta/recipes-support/sqlite/sqlite3.inc
@@ -6,11 +6,6 @@ DEPENDS = "readline ncurses tcl-native"
DEPENDS_virtclass-native = "tcl-native"
LICENSE = "PD"
-SRC_URI = "http://www.sqlite.org/sqlite-${PV}.tar.gz \
- file://libtool.patch"
-
-S = "${WORKDIR}/sqlite-${PV}"
-
inherit autotools pkgconfig
EXTRA_OECONF = "--disable-tcl --enable-shared --enable-threadsafe"
diff --git a/meta/recipes-support/sqlite/sqlite3/libtool.patch b/meta/recipes-support/sqlite/sqlite3/libtool.patch
deleted file mode 100644
index ccf9993..0000000
--- a/meta/recipes-support/sqlite/sqlite3/libtool.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Index: sqlite-3.2.1/Makefile.in
-===================================================================
---- sqlite-3.2.1.orig/Makefile.in 2005-03-23 17:09:39.000000000 +0100
-+++ sqlite-3.2.1/Makefile.in 2005-04-25 23:11:20.000000000 +0200
-@@ -15,7 +15,10 @@
- # The toplevel directory of the source tree. This is the directory
- # that contains this "Makefile.in" and the "configure.in" script.
- #
--TOP = @srcdir@
-+TOP = $(srcdir)
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
-+top_builddir = .
-
- # C Compiler and options for use in building executables that
- # will run on the platform that is doing the build.
-@@ -96,7 +99,7 @@
- exec_prefix = @exec_prefix@
- libdir = @libdir@
- INSTALL = @INSTALL@
--LIBTOOL = ./libtool
-+LIBTOOL = @LIBTOOL@
- ALLOWRELEASE = @ALLOWRELEASE@
-
- # libtool compile/link/install
diff --git a/meta/recipes-support/sqlite/sqlite3_3.7.5.bb b/meta/recipes-support/sqlite/sqlite3_3.7.5.bb
deleted file mode 100644
index 212d9e2..0000000
--- a/meta/recipes-support/sqlite/sqlite3_3.7.5.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require sqlite3.inc
-
-LIC_FILES_CHKSUM = "file://sqlite3.c;endline=19;md5=c1b8048b783961c3ba387c43fd955dc6"
-
-SRC_URI = "http://www.sqlite.org/sqlite-autoconf-3070500.tar.gz"
-S = "${WORKDIR}/sqlite-autoconf-3070500"
-PR = "r0"
-
-SRC_URI[md5sum] = "a9604a82613ade2e7f4c303f233e477f"
-SRC_URI[sha256sum] = "cb5b86926ec9f65882b2dddd244f2d620337d911ec73411863f77e48cf6a2f94"
diff --git a/meta/recipes-support/sqlite/sqlite3_3.7.6.2.bb b/meta/recipes-support/sqlite/sqlite3_3.7.6.2.bb
new file mode 100644
index 0000000..34d1653
--- /dev/null
+++ b/meta/recipes-support/sqlite/sqlite3_3.7.6.2.bb
@@ -0,0 +1,10 @@
+require sqlite3.inc
+
+LIC_FILES_CHKSUM = "file://sqlite3.h;endline=11;md5=65f0a57ca6928710b418c094b3570bb0"
+
+SRC_URI = "http://www.sqlite.org/sqlite-autoconf-3070602.tar.gz"
+S = "${WORKDIR}/sqlite-autoconf-3070602"
+PR = "r0"
+
+SRC_URI[md5sum] = "f16c08617968b4087b3d591fd575f59f"
+SRC_URI[sha256sum] = "53aa66f30d8ff87230d4173b7979814432b8084da77fba05992223f76593fc81"
--
1.7.0.4
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 3/5] xserver-xf86-dri-lite: upgrade from 1.9.3 to 1.10.1
2011-05-11 7:27 [PATCH 0/5] recipes upgrade: xserver, sqlite3, xf86-video-intel Yu Ke
2011-05-11 7:27 ` [PATCH 1/5] xf86-video-intel: upgrade from 2.14.0 to 2.15.0 Yu Ke
2011-05-11 7:27 ` [PATCH 2/5] sqlite: upgrade from 3.7.5 to 3.7.6.2 Yu Ke
@ 2011-05-11 7:27 ` Yu Ke
2011-05-11 7:27 ` [PATCH 4/5] xserver-xf86-dri-lite_git: upgrade to 1.10.2 RC1 snapshot Yu Ke
` (2 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Yu Ke @ 2011-05-11 7:27 UTC (permalink / raw)
To: openembedded-core
From: Yu Ke <ke.yu@intel.com>
- update the license checksum due to SUN/Oracle name changing
- remove the nodolt.patch because it is already in upstream and release
http://cgit.freedesktop.org/xorg/xserver/commit/?id=a769f4c22a9cfb5ba248c924a66c31ec966bd8a0
- update the patch upstream status
Signed-off-by: Yu Ke <ke.yu@intel.com>
---
.../distro/include/preferred-xorg-versions.inc | 2 +-
.../xserver-xf86-dri-lite/macro_tweak.patch | 2 +
.../xserver-xf86-dri-lite/nodolt.patch | 12 ----------
.../xorg-xserver/xserver-xf86-dri-lite_1.10.1.bb | 20 ++++++++++++++++++
.../xorg-xserver/xserver-xf86-dri-lite_1.9.3.bb | 22 --------------------
5 files changed, 23 insertions(+), 35 deletions(-)
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/nodolt.patch
create mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_1.10.1.bb
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_1.9.3.bb
diff --git a/meta/conf/distro/include/preferred-xorg-versions.inc b/meta/conf/distro/include/preferred-xorg-versions.inc
index 7afa8c9..add4d29 100644
--- a/meta/conf/distro/include/preferred-xorg-versions.inc
+++ b/meta/conf/distro/include/preferred-xorg-versions.inc
@@ -128,7 +128,7 @@ PREFERRED_VERSION_xproxymanagementprotocol ?= "1.0.3"
PREFERRED_VERSION_xrandr ?= "1.3.4"
PREFERRED_VERSION_xrdb ?= "1.0.5"
PREFERRED_VERSION_xserver-kdrive ?= "1.7.99.2"
-PREFERRED_VERSION_xserver-xf86-dri-lite ?= "1.9.3"
+PREFERRED_VERSION_xserver-xf86-dri-lite ?= "1.10.1"
PREFERRED_VERSION_xset ?= "1.2.1"
PREFERRED_VERSION_xtrans ?= "1.2.6"
PREFERRED_VERSION_xtrans-native ?= "1.2.6"
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/macro_tweak.patch b/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/macro_tweak.patch
index cd408c7..2b75427 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/macro_tweak.patch
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/macro_tweak.patch
@@ -6,6 +6,8 @@ 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.
+Upstream-Status: Pending
+
Signed-off-by: Yu Ke <ke.yu@intel.com>
diff --git a/xorg-server.m4 b/xorg-server.m4
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/nodolt.patch b/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/nodolt.patch
deleted file mode 100644
index 6b34032..0000000
--- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/nodolt.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: git/configure.ac
-===================================================================
---- git.orig/configure.ac 2009-01-15 20:35:31.000000000 +0000
-+++ git/configure.ac 2009-01-15 20:35:38.000000000 +0000
-@@ -62,7 +62,6 @@
- AC_LIBTOOL_WIN32_DLL
- AC_DISABLE_STATIC
- AC_PROG_LIBTOOL
--DOLT
- AC_PROG_MAKE_SET
- PKG_PROG_PKG_CONFIG
- AC_PROG_LEX
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_1.10.1.bb b/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_1.10.1.bb
new file mode 100644
index 0000000..ea57140
--- /dev/null
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_1.10.1.bb
@@ -0,0 +1,20 @@
+require xserver-xf86-dri-lite.inc
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=74df27b6254cc88d2799b5f4f5949c00"
+
+PROTO_DEPS += "xf86driproto dri2proto"
+
+DEPENDS += "font-util"
+
+PE = "1"
+PR = "r0"
+
+SRC_URI += "file://crosscompile.patch"
+
+# Misc build failure for master HEAD
+SRC_URI += "file://fix_open_max_preprocessor_error.patch"
+
+SRC_URI[md5sum] = "75f117c74f2ecaf9dd167f6a66ac98de"
+SRC_URI[sha256sum] = "143c7c3d7d4428352e1153dffa34fd64af391f72d30b2a03e911e54e36f00b5d"
+
+EXTRA_OECONF += "--enable-dri --enable-dri2"
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_1.9.3.bb b/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_1.9.3.bb
deleted file mode 100644
index faa4f64..0000000
--- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_1.9.3.bb
+++ /dev/null
@@ -1,22 +0,0 @@
-require xserver-xf86-dri-lite.inc
-
-
-PROTO_DEPS += "xf86driproto dri2proto"
-
-DEPENDS += "font-util"
-
-PE = "1"
-PR = "r0"
-
-SRC_URI += "file://nodolt.patch \
- file://crosscompile.patch"
-# file://libdri-xinerama-symbol.patch;patch=1
-# file://xserver-boottime.patch;patch=1
-
-# Misc build failure for master HEAD
-SRC_URI += "file://fix_open_max_preprocessor_error.patch"
-
-SRC_URI[md5sum] = "5bef6839a76d029204ab31aa2fcb5201"
-SRC_URI[sha256sum] = "864831f51e841ff37f2445d1c85b86b559c8860a435fb496aead4f256a2b141d"
-
-EXTRA_OECONF += "--enable-dri --enable-dri2"
--
1.7.0.4
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 4/5] xserver-xf86-dri-lite_git: upgrade to 1.10.2 RC1 snapshot
2011-05-11 7:27 [PATCH 0/5] recipes upgrade: xserver, sqlite3, xf86-video-intel Yu Ke
` (2 preceding siblings ...)
2011-05-11 7:27 ` [PATCH 3/5] xserver-xf86-dri-lite: upgrade from 1.9.3 to 1.10.1 Yu Ke
@ 2011-05-11 7:27 ` Yu Ke
2011-05-11 7:28 ` [PATCH 5/5] xserver-xf86-lite: upgrade to from 1.7 RC2 to 1.10.1 Yu Ke
2011-05-11 15:34 ` [PATCH 0/5] recipes upgrade: xserver, sqlite3, xf86-video-intel Richard Purdie
5 siblings, 0 replies; 7+ messages in thread
From: Yu Ke @ 2011-05-11 7:27 UTC (permalink / raw)
To: openembedded-core
From: Yu Ke <ke.yu@intel.com>
- the following patches are no longer used, so remove them
doublefix.patch
drmfix.patch
fix_macros.patch
libdri-xinerama-symbol.patch
xorg-server-disable-dri_sarea.patch
xorg-server-enable-dri2.patch
xserver-1.5.0-bg-none-root.patch
xserver-DRI2Swapbuffer.patch
xserver-boottime.patch
xserver-no-root-2.patch
- update the patch upstream status
Signed-off-by: Yu Ke <ke.yu@intel.com>
---
.../cache-xkbcomp-output-for-fast-start-up.patch | 2 +
.../xserver-xf86-dri-lite/crosscompile.patch | 2 +
.../xserver-xf86-dri-lite/doublefix.patch | 13 --
.../xserver-xf86-dri-lite/drmfix.patch | 13 --
.../xserver-xf86-dri-lite/fix_macros.patch | 21 ---
.../xserver-xf86-dri-lite/fix_macros1.patch | 2 +
.../fix_open_max_preprocessor_error.patch | 2 +
.../libdri-xinerama-symbol.patch | 50 ------
.../xorg-server-disable-dri_sarea.patch | 12 --
.../xorg-server-enable-dri2.patch | 23 ---
.../xserver-1.5.0-bg-none-root.patch | 156 -----------------
.../xserver-DRI2Swapbuffer.patch | 179 --------------------
.../xserver-xf86-dri-lite/xserver-boottime.patch | 38 ----
.../xserver-xf86-dri-lite/xserver-no-root-2.patch | 105 ------------
.../xorg-xserver/xserver-xf86-dri-lite_git.bb | 21 +--
15 files changed, 15 insertions(+), 624 deletions(-)
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/doublefix.patch
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/drmfix.patch
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/fix_macros.patch
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/libdri-xinerama-symbol.patch
delete mode 100755 meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/xorg-server-disable-dri_sarea.patch
delete mode 100755 meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/xorg-server-enable-dri2.patch
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/xserver-1.5.0-bg-none-root.patch
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/xserver-DRI2Swapbuffer.patch
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/xserver-boottime.patch
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/xserver-no-root-2.patch
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/cache-xkbcomp-output-for-fast-start-up.patch b/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/cache-xkbcomp-output-for-fast-start-up.patch
index b121bba..6b1b40f 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/cache-xkbcomp-output-for-fast-start-up.patch
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/cache-xkbcomp-output-for-fast-start-up.patch
@@ -7,6 +7,8 @@ Organization: Intel
xkbcomp outputs will be cached in files with hashed keymap as
names. This saves boot time for around 1s on commodity netbooks.
+Upstream-Status: Pending
+
Signed-off-by: Yan Li <yan.i.li@intel.com>
---
configure.ac | 6 +-
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/crosscompile.patch b/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/crosscompile.patch
index 8b82de2..2f98bb8 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/crosscompile.patch
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/crosscompile.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
diff --git a/configure.ac b/configure.ac
index b3b752c..600500b 100644
--- a/configure.ac
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/doublefix.patch b/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/doublefix.patch
deleted file mode 100644
index 092a712..0000000
--- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/doublefix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: xorg-server-1.6.0/hw/xfree86/common/Makefile.am
-===================================================================
---- xorg-server-1.6.0.orig/hw/xfree86/common/Makefile.am 2010-02-01 14:04:53.247789918 +0000
-+++ xorg-server-1.6.0/hw/xfree86/common/Makefile.am 2010-02-01 14:05:27.787817002 +0000
-@@ -46,7 +46,7 @@
- sdk_HEADERS = compiler.h fourcc.h xf86.h xf86Module.h xf86Opt.h \
- xf86PciInfo.h xf86Priv.h xf86Privstr.h xf86Resources.h \
- xf86cmap.h xf86fbman.h xf86str.h xf86RAC.h xf86Xinput.h xisb.h \
-- $(XVSDKINCS) xorgVersion.h \
-+ xorgVersion.h \
- xf86sbusBus.h xf86xv.h xf86xvmc.h xf86xvpriv.h
-
- DISTCLEANFILES = xf86Build.h
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/drmfix.patch b/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/drmfix.patch
deleted file mode 100644
index a62a767..0000000
--- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/drmfix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: xorg-server-1.4/hw/xfree86/os-support/linux/Makefile.am
-===================================================================
---- xorg-server-1.4.orig/hw/xfree86/os-support/linux/Makefile.am 2007-08-23 21:04:53.000000000 +0200
-+++ xorg-server-1.4/hw/xfree86/os-support/linux/Makefile.am 2008-03-13 18:27:23.000000000 +0100
-@@ -41,7 +41,7 @@
-
- AM_CFLAGS = -DUSESTDRES -DHAVE_SYSV_IPC $(DIX_CFLAGS) $(XORG_CFLAGS) $(PLATFORM_DEFINES)
-
--INCLUDES = $(XORG_INCS) $(PLATFORM_INCLUDES) -I/usr/include/drm # FIXME this last part is crack
-+INCLUDES = $(XORG_INCS) $(PLATFORM_INCLUDES) $(LIBDRM_CFLAGS)
-
- # FIXME: These need to be added to the build
- LNX_EXTRA_SRCS = \
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/fix_macros.patch b/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/fix_macros.patch
deleted file mode 100644
index eed491b..0000000
--- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/fix_macros.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-We need to insert the sysroot path into compiler commandlines for this
-kind of variable use, otherwise we're looking into /usr/include/.
-
-RP - 26/11/09
-
-Index: git/xorg-server.m4
-===================================================================
---- git.orig/xorg-server.m4 2009-11-10 12:04:34.000000000 +0000
-+++ git/xorg-server.m4 2009-11-27 00:05:02.000000000 +0000
-@@ -28,9 +28,10 @@
- # 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],[
- 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-xf86-dri-lite/fix_macros1.patch b/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/fix_macros1.patch
index 94852f0..b2c8d58 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/fix_macros1.patch
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/fix_macros1.patch
@@ -3,6 +3,8 @@ kind of variable use, otherwise we're looking into /usr/include/.
RP - 26/11/09
+Upstream-Status: Pending
+
Index: git/xorg-server.m4
===================================================================
--- git.orig/xorg-server.m4 2010-02-05 10:00:55.000000000 +0000
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/fix_open_max_preprocessor_error.patch b/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/fix_open_max_preprocessor_error.patch
index 565832e..9c33072 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/fix_open_max_preprocessor_error.patch
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/fix_open_max_preprocessor_error.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [embedded specific]
+
Index: git/os/osdep.h
===================================================================
--- git.orig/os/osdep.h 2008-10-07 18:38:21.000000000 +0100
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/libdri-xinerama-symbol.patch b/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/libdri-xinerama-symbol.patch
deleted file mode 100644
index db29da9..0000000
--- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/libdri-xinerama-symbol.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-Index: xorg-server-1.5.0/hw/xfree86/dri/dri.c
-===================================================================
---- xorg-server-1.5.0.orig/hw/xfree86/dri/dri.c 2008-09-24 17:43:04.000000000 +0100
-+++ xorg-server-1.5.0/hw/xfree86/dri/dri.c 2008-09-24 17:46:38.000000000 +0100
-@@ -73,10 +73,6 @@
-
- #define PCI_BUS_NO_DOMAIN(bus) ((bus) & 0xffu)
-
--#if !defined(PANORAMIX)
--extern Bool noPanoramiXExtension;
--#endif
--
- static int DRIEntPrivIndex = -1;
- static DevPrivateKey DRIScreenPrivKey = &DRIScreenPrivKey;
- static DevPrivateKey DRIWindowPrivKey = &DRIWindowPrivKey;
-@@ -307,7 +303,6 @@
- drm_context_t * reserved;
- int reserved_count;
- int i;
-- Bool xineramaInCore = FALSE;
- DRIEntPrivPtr pDRIEntPriv;
- ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
- DRIContextFlags flags = 0;
-@@ -320,20 +315,13 @@
- return FALSE;
- }
-
-- /*
-- * If Xinerama is on, don't allow DRI to initialise. It won't be usable
-- * anyway.
-- */
-- if (xf86LoaderCheckSymbol("noPanoramiXExtension"))
-- xineramaInCore = TRUE;
--
-- if (xineramaInCore) {
-- if (!noPanoramiXExtension) {
-- DRIDrvMsg(pScreen->myNum, X_WARNING,
-- "Direct rendering is not supported when Xinerama is enabled\n");
-- return FALSE;
-- }
-+#if defined(PANORAMIX)
-+ if (!noPanoramiXExtension) {
-+ DRIDrvMsg(pScreen->myNum, X_WARNING,
-+ "Direct rendering is not supported when Xinerama is enabled\n");
-+ return FALSE;
- }
-+#endif
-
- if (!DRIOpenDRMMaster(pScrn, pDRIInfo->SAREASize,
- pDRIInfo->busIdString,
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/xorg-server-disable-dri_sarea.patch b/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/xorg-server-disable-dri_sarea.patch
deleted file mode 100755
index 3d2fa16..0000000
--- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/xorg-server-disable-dri_sarea.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN xorg-server-1.5.99.1/hw/xfree86/dri2/dri2.c xorg-server-1.5.99.1.new/hw/xfree86/dri2/dri2.c
---- xorg-server-1.5.99.1/hw/xfree86/dri2/dri2.c 2008-09-01 03:26:37.000000000 +0800
-+++ xorg-server-1.5.99.1.new/hw/xfree86/dri2/dri2.c 2008-09-18 00:28:16.000000000 +0800
-@@ -39,7 +39,7 @@
- #include "scrnintstr.h"
- #include "windowstr.h"
- #include "dri2.h"
--#include <GL/internal/dri_sarea.h>
-+//#include <GL/internal/dri_sarea.h>
-
- #include "xf86.h"
-
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/xorg-server-enable-dri2.patch b/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/xorg-server-enable-dri2.patch
deleted file mode 100755
index 7ff3658..0000000
--- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/xorg-server-enable-dri2.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-commit 67b9b3a77a8b86eef03af36a0f4be3a07411efee
-Author: Eric Anholt <eric@anholt.net>
-Date: Thu Sep 11 16:18:17 2008 -0700
-
- Enable DRI2 build.
-
-diff --git a/hw/xfree86/Makefile.am b/hw/xfree86/Makefile.am
-index eff2c31..98d7ec8 100644
---- a/hw/xfree86/Makefile.am
-+++ b/hw/xfree86/Makefile.am
-@@ -4,9 +4,9 @@ if DRI
- DRI_SUBDIR = dri
- endif
-
--#if DRI2
--#DRI2_SUBDIR = dri2
--#endif
-+if DRI2
-+DRI2_SUBDIR = dri2
-+endif
-
- if XF86UTILS
- XF86UTILS_SUBDIR = utils
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/xserver-1.5.0-bg-none-root.patch b/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/xserver-1.5.0-bg-none-root.patch
deleted file mode 100644
index ef53689..0000000
--- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/xserver-1.5.0-bg-none-root.patch
+++ /dev/null
@@ -1,156 +0,0 @@
-From a3e15680da24cb8259f6a83dee0c930dab024290 Mon Sep 17 00:00:00 2001
-From: Kristian <krh@redhat.com>
-Date: Fri, 15 Aug 2008 15:15:14 +1000
-Subject: [PATCH] Add nr for background=none root
-
----
- dix/globals.c | 1 +
- dix/window.c | 22 ++++++++++++----------
- hw/xfree86/common/xf86Init.c | 11 +++++++++++
- hw/xfree86/common/xf86str.h | 5 ++++-
- include/opaque.h | 1 +
- os/utils.c | 3 +++
- 6 files changed, 32 insertions(+), 11 deletions(-)
-
-diff --git a/dix/globals.c b/dix/globals.c
-index 973dc43..dbd76bb 100644
---- a/dix/globals.c
-+++ b/dix/globals.c
-@@ -141,6 +141,7 @@ FontPtr defaultFont; /* not declared in dix.h to avoid including font.h in
- CursorPtr rootCursor;
- Bool party_like_its_1989 = FALSE;
- Bool whiteRoot = FALSE;
-+Bool bgNoneRoot = FALSE;
-
- int cursorScreenDevPriv[MAXSCREENS];
-
-diff --git a/dix/window.c b/dix/window.c
-index c31fa87..8bb178d 100644
---- a/dix/window.c
-+++ b/dix/window.c
-@@ -482,23 +482,24 @@ InitRootWindow(WindowPtr pWin)
- pWin->cursorIsNone = FALSE;
- pWin->optional->cursor = rootCursor;
- rootCursor->refcnt++;
--
-+ pWin->backingStore = defaultBackingStore;
-+ pWin->forcedBS = (defaultBackingStore != NotUseful);
-
- if (party_like_its_1989) {
- MakeRootTile(pWin);
- backFlag |= CWBackPixmap;
-+ pScreen->ChangeWindowAttributes(pWin, backFlag);
-+ } else if (bgNoneRoot) {
-+ /* nothing, handled in xf86CreateRootWindow */
- } else {
- if (whiteRoot)
- pWin->background.pixel = pScreen->whitePixel;
- else
- pWin->background.pixel = pScreen->blackPixel;
- backFlag |= CWBackPixel;
-- }
-
-- pWin->backingStore = defaultBackingStore;
-- pWin->forcedBS = (defaultBackingStore != NotUseful);
-- /* We SHOULD check for an error value here XXX */
-- (*pScreen->ChangeWindowAttributes)(pWin, backFlag);
-+ pScreen->ChangeWindowAttributes(pWin, backFlag);
-+ }
-
- MapWindow(pWin, serverClient);
- }
-diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
-index 236c00b..083a6ac 100644
---- a/hw/xfree86/common/xf86Init.c
-+++ b/hw/xfree86/common/xf86Init.c
-@@ -79,6 +79,7 @@
- #ifdef RENDER
- #include "picturestr.h"
- #endif
-+#include "xace.h"
-
- #include "globals.h"
-
-@@ -328,6 +329,7 @@ xf86CreateRootWindow(WindowPtr pWin)
- int ret = TRUE;
- int err = Success;
- ScreenPtr pScreen = pWin->drawable.pScreen;
-+ ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
- RootWinPropPtr pProp;
- CreateWindowProcPtr CreateWindow = (CreateWindowProcPtr)
- dixLookupPrivate(&pScreen->devPrivates, xf86CreateRootWindowKey);
-@@ -381,6 +383,15 @@ xf86CreateRootWindow(WindowPtr pWin)
- }
- }
-
-+ if (bgNoneRoot && pScrn->canDoBGNoneRoot || 1) {
-+ pWin->backgroundState = XaceBackgroundNoneState(pWin);
-+ pWin->background.pixel = pScreen->whitePixel;
-+ pScreen->ChangeWindowAttributes(pWin, CWBackPixmap | CWBorderPixel | CWCursor | CWBackingStore);
-+ } else {
-+ pWin->background.pixel = pScreen->blackPixel;
-+ pScreen->ChangeWindowAttributes(pWin, CWBackPixel | CWBorderPixel | CWCursor | CWBackingStore);
-+ }
-+
- #ifdef DEBUG
- ErrorF("xf86CreateRootWindow() returns %d\n", ret);
- #endif
-diff --git a/hw/xfree86/common/xf86str.h b/hw/xfree86/common/xf86str.h
-index 904c369..8c38f69 100644
---- a/hw/xfree86/common/xf86str.h
-+++ b/hw/xfree86/common/xf86str.h
-@@ -531,7 +531,7 @@ typedef struct _confdrirec {
- } confDRIRec, *confDRIPtr;
-
- /* These values should be adjusted when new fields are added to ScrnInfoRec */
--#define NUM_RESERVED_INTS 16
-+#define NUM_RESERVED_INTS 15
- #define NUM_RESERVED_POINTERS 15
- #define NUM_RESERVED_FUNCS 11
-
-@@ -959,6 +959,9 @@ typedef struct _ScrnInfoRec {
- ClockRangesPtr clockRanges;
- int adjustFlags;
-
-+ /* -nr support */
-+ int canDoBGNoneRoot;
-+
- /*
- * These can be used when the minor ABI version is incremented.
- * The NUM_* parameters must be reduced appropriately to keep the
-diff --git a/include/opaque.h b/include/opaque.h
-index 07a0715..be1577b 100644
---- a/include/opaque.h
-+++ b/include/opaque.h
-@@ -71,6 +71,7 @@ extern Bool defeatAccessControl;
- extern long maxBigRequestSize;
- extern Bool party_like_its_1989;
- extern Bool whiteRoot;
-+extern Bool bgNoneRoot;
-
- extern Bool CoreDump;
-
-diff --git a/os/utils.c b/os/utils.c
-index b100949..c41b45b 100644
---- a/os/utils.c
-+++ b/os/utils.c
-@@ -515,6 +515,7 @@ void UseMsg(void)
- #endif
- ErrorF("-nolisten string don't listen on protocol\n");
- ErrorF("-noreset don't reset after last client exists\n");
-+ ErrorF("-nr create root window with no background\n");
- ErrorF("-reset reset after last client exists\n");
- ErrorF("-p # screen-saver pattern duration (minutes)\n");
- ErrorF("-pn accept failure to listen on all ports\n");
-@@ -859,6 +860,8 @@ ProcessCommandLine(int argc, char *argv[])
- defaultBackingStore = WhenMapped;
- else if ( strcmp( argv[i], "-wr") == 0)
- whiteRoot = TRUE;
-+ else if ( strcmp( argv[i], "-nr") == 0)
-+ bgNoneRoot = TRUE;
- else if ( strcmp( argv[i], "-maxbigreqsize") == 0) {
- if(++i < argc) {
- long reqSizeArg = atol(argv[i]);
---
-1.5.3.4
-
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/xserver-DRI2Swapbuffer.patch b/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/xserver-DRI2Swapbuffer.patch
deleted file mode 100644
index 2754170..0000000
--- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/xserver-DRI2Swapbuffer.patch
+++ /dev/null
@@ -1,179 +0,0 @@
-diff --git a/glx/glxdri2.c b/glx/glxdri2.c
-index 146ea82..3b5338b 100644
---- a/glx/glxdri2.c
-+++ b/glx/glxdri2.c
-@@ -70,6 +70,7 @@ struct __GLXDRIscreen {
-
- const __DRIcoreExtension *core;
- const __DRIdri2Extension *dri2;
-+ const __DRI2flushExtension *flush;
- const __DRIcopySubBufferExtension *copySubBuffer;
- const __DRIswapControlExtension *swapControl;
- const __DRItexBufferExtension *texBuffer;
-@@ -135,10 +136,14 @@ __glXDRIdrawableCopySubBuffer(__GLXdrawable *drawable,
- static GLboolean
- __glXDRIdrawableSwapBuffers(__GLXdrawable *drawable)
- {
-- __GLXDRIdrawable *private = (__GLXDRIdrawable *) drawable;
-+ __GLXDRIdrawable *priv = (__GLXDRIdrawable *) drawable;
-+ __GLXDRIscreen *screen = priv->screen;
-+
-+ if (!DRI2SwapBuffers(drawable->pDraw))
-+ return FALSE;
-
-- __glXDRIdrawableCopySubBuffer(drawable, 0, 0,
-- private->width, private->height);
-+ if (screen->flush->flushInvalidate)
-+ (*screen->flush->flushInvalidate)(priv->driDrawable);
-
- return TRUE;
- }
-diff --git a/hw/xfree86/dri2/dri2.c b/hw/xfree86/dri2/dri2.c
-index 580383d..23e6467 100644
---- a/hw/xfree86/dri2/dri2.c
-+++ b/hw/xfree86/dri2/dri2.c
-@@ -70,6 +70,7 @@ typedef struct _DRI2Screen {
- DRI2CreateBufferProcPtr CreateBuffer;
- DRI2DestroyBufferProcPtr DestroyBuffer;
- DRI2CopyRegionProcPtr CopyRegion;
-+ DRI2SwapBuffersProcPtr SwapBuffers;
-
- HandleExposuresProcPtr HandleExposures;
- } DRI2ScreenRec, *DRI2ScreenPtr;
-@@ -422,6 +423,49 @@ DRI2CopyRegion(DrawablePtr pDraw, RegionPtr pRegion,
- return Success;
- }
-
-+Bool
-+DRI2SwapBuffers(DrawablePtr pDraw)
-+{
-+ DRI2ScreenPtr ds = DRI2GetScreen(pDraw->pScreen);
-+ DRI2DrawablePtr pPriv;
-+ DRI2BufferPtr pDestBuffer, pSrcBuffer;
-+ int i;
-+
-+ pPriv = DRI2GetDrawable(pDraw);
-+ if (pPriv == NULL)
-+ return FALSE;
-+
-+ pDestBuffer = NULL;
-+ pSrcBuffer = NULL;
-+ for (i = 0; i < pPriv->bufferCount; i++)
-+ {
-+ if (pPriv->buffers[i]->attachment == DRI2BufferFrontLeft)
-+ pDestBuffer = (DRI2BufferPtr) pPriv->buffers[i];
-+ if (pPriv->buffers[i]->attachment == DRI2BufferBackLeft)
-+ pSrcBuffer = (DRI2BufferPtr) pPriv->buffers[i];
-+ }
-+ if (pSrcBuffer == NULL || pDestBuffer == NULL)
-+ return FALSE;
-+
-+ if (ds->SwapBuffers) {
-+ if ((*ds->SwapBuffers)(pDraw, pDestBuffer, pSrcBuffer))
-+ return TRUE;
-+ }
-+
-+ BoxRec box;
-+ RegionRec region;
-+
-+ box.x1 = 0;
-+ box.y1 = 0;
-+ box.x2 = pDraw->width;
-+ box.y2 = pDraw->height;
-+ REGION_INIT(drawable->pDraw->pScreen, ®ion, &box, 0);
-+ if (DRI2CopyRegion(pDraw, ®ion, DRI2BufferFrontLeft, DRI2BufferBackLeft) != Success)
-+ return FALSE;
-+
-+ return TRUE;
-+}
-+
- void
- DRI2DestroyDrawable(DrawablePtr pDraw)
- {
-@@ -538,6 +582,9 @@ DRI2ScreenInit(ScreenPtr pScreen, DRI2InfoPtr info)
- }
- ds->CopyRegion = info->CopyRegion;
-
-+ if (info->version >= 3)
-+ ds->SwapBuffers = info->SwapBuffers;
-+
- dixSetPrivate(&pScreen->devPrivates, dri2ScreenPrivateKey, ds);
-
- xf86DrvMsg(pScreen->myNum, X_INFO, "[DRI2] Setup complete\n");
-diff --git a/hw/xfree86/dri2/dri2.h b/hw/xfree86/dri2/dri2.h
-index f369267..e2784dd 100644
---- a/hw/xfree86/dri2/dri2.h
-+++ b/hw/xfree86/dri2/dri2.h
-@@ -67,6 +67,10 @@ typedef void (*DRI2CopyRegionProcPtr)(DrawablePtr pDraw,
- DRI2BufferPtr pDestBuffer,
- DRI2BufferPtr pSrcBuffer);
-
-+typedef Bool (*DRI2SwapBuffersProcPtr)(DrawablePtr pDraw,
-+ DRI2BufferPtr pFrontBuffer,
-+ DRI2BufferPtr pBackBuffer);
-+
- typedef void (*DRI2WaitProcPtr)(WindowPtr pWin,
- unsigned int sequence);
-
-@@ -90,6 +94,7 @@ typedef struct {
- DRI2CreateBuffersProcPtr CreateBuffers;
- DRI2DestroyBuffersProcPtr DestroyBuffers;
- DRI2CopyRegionProcPtr CopyRegion;
-+ DRI2SwapBuffersProcPtr SwapBuffers;
- DRI2WaitProcPtr Wait;
-
- /**
-@@ -153,4 +158,6 @@ extern _X_EXPORT DRI2Buffer2Ptr *DRI2GetBuffersWithFormat(DrawablePtr pDraw,
- int *width, int *height, unsigned int *attachments, int count,
- int *out_count);
-
-+extern _X_EXPORT Bool DRI2SwapBuffers(DrawablePtr pDraw);
-+
- #endif
-diff --git a/hw/xfree86/dri2/dri2ext.c b/hw/xfree86/dri2/dri2ext.c
-index 3c06174..67b419b 100644
---- a/hw/xfree86/dri2/dri2ext.c
-+++ b/hw/xfree86/dri2/dri2ext.c
-@@ -81,7 +81,7 @@ ProcDRI2QueryVersion(ClientPtr client)
- rep.length = 0;
- rep.sequenceNumber = client->sequence;
- rep.majorVersion = 1;
-- rep.minorVersion = 1;
-+ rep.minorVersion = 2;
-
- if (client->swapped) {
- swaps(&rep.sequenceNumber, n);
-@@ -323,6 +323,24 @@ ProcDRI2CopyRegion(ClientPtr client)
- }
-
- static int
-+ProcDRI2SwapBuffers(ClientPtr client)
-+{
-+ REQUEST(xDRI2SwapBuffersReq);
-+ DrawablePtr pDrawable;
-+ int status;
-+
-+ REQUEST_SIZE_MATCH(xDRI2SwapBuffersReq);
-+
-+ if (!validDrawable(client, stuff->drawable, &pDrawable, &status))
-+ return status;
-+
-+ if (!DRI2SwapBuffers(pDrawable))
-+ return BadAlloc;
-+
-+ return client->noClientException;
-+}
-+
-+static int
- ProcDRI2Dispatch (ClientPtr client)
- {
- REQUEST(xReq);
-@@ -350,6 +368,8 @@ ProcDRI2Dispatch (ClientPtr client)
- return ProcDRI2CopyRegion(client);
- case X_DRI2GetBuffersWithFormat:
- return ProcDRI2GetBuffersWithFormat(client);
-+ case X_DRI2SwapBuffers:
-+ return ProcDRI2SwapBuffers(client);
- default:
- return BadRequest;
- }
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/xserver-boottime.patch b/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/xserver-boottime.patch
deleted file mode 100644
index efc85a4..0000000
--- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/xserver-boottime.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff --git a/os/log.c b/os/log.c
-index 0860847..2c46f1a 100644
---- a/os/log.c
-+++ b/os/log.c
-@@ -255,6 +255,33 @@ LogVWrite(int verb, const char *f, va_list args)
- static char tmpBuffer[1024];
- int len = 0;
-
-+ struct timeval time;
-+ time_t tv_sec;
-+ suseconds_t tv_usec;
-+ static Bool first = TRUE;
-+ static time_t start_tv_sec;
-+ static suseconds_t start_usec;
-+ int diff_sec, diff_usec;
-+
-+ gettimeofday(&time, NULL);
-+ tv_sec = time.tv_sec;
-+ tv_usec = time.tv_usec;
-+ if (first == TRUE) {
-+ start_tv_sec = tv_sec;
-+ start_usec = tv_usec;
-+ first = FALSE;
-+ }
-+ diff_sec = (int)difftime(tv_sec, start_tv_sec);
-+ diff_usec = (tv_usec - start_usec);
-+ if (diff_usec < 0) {
-+ diff_sec--;
-+ diff_usec += 1000000;
-+ }
-+ sprintf(tmpBuffer, "[%d sec: %06d usec]", diff_sec , diff_usec);
-+ len = strlen(tmpBuffer);
-+ if (logFile)
-+ fwrite(tmpBuffer, len, 1, logFile);
-+
- /*
- * Since a va_list can only be processed once, write the string to a
- * buffer, and then write the buffer out to the appropriate output
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/xserver-no-root-2.patch b/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/xserver-no-root-2.patch
deleted file mode 100644
index afc94dc..0000000
--- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/xserver-no-root-2.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-diff --git a/hw/xfree86/os-support/linux/lnx_init.c b/hw/xfree86/os-support/linux/lnx_init.c
-index 7f40857..cf58c01 100644
---- a/hw/xfree86/os-support/linux/lnx_init.c
-+++ b/hw/xfree86/os-support/linux/lnx_init.c
-@@ -49,6 +49,7 @@ static Bool KeepTty = FALSE;
- static int VTnum = -1;
- static Bool VTSwitch = TRUE;
- static Bool ShareVTs = FALSE;
-+Bool NoHwAccess = FALSE;
- static int activeVT = -1;
-
- static int vtPermSave[4];
-@@ -80,9 +81,11 @@ saveVtPerms(void)
- static void
- restoreVtPerms(void)
- {
-- /* Set the terminal permissions back to before we started. */
-- chown("/dev/tty0", vtPermSave[0], vtPermSave[1]);
-- chown(vtname, vtPermSave[2], vtPermSave[3]);
-+ if (geteuid() == 0) {
-+ /* Set the terminal permissions back to before we started. */
-+ (void)chown("/dev/tty0", vtPermSave[0], vtPermSave[1]);
-+ (void)chown(vtname, vtPermSave[2], vtPermSave[3]);
-+ }
- }
-
- static void *console_handler;
-@@ -210,20 +213,22 @@ xf86OpenConsole(void)
- xf86Msg(X_WARNING,
- "xf86OpenConsole: Could not save ownership of VT\n");
-
-- /* change ownership of the vt */
-- if (chown(vtname, getuid(), getgid()) < 0)
-- xf86Msg(X_WARNING,"xf86OpenConsole: chown %s failed: %s\n",
-- vtname, strerror(errno));
--
-- /*
-- * the current VT device we're running on is not "console", we want
-- * to grab all consoles too
-- *
-- * Why is this needed??
-- */
-- if (chown("/dev/tty0", getuid(), getgid()) < 0)
-- xf86Msg(X_WARNING,"xf86OpenConsole: chown /dev/tty0 failed: %s\n",
-- strerror(errno));
-+ if (geteuid() == 0) {
-+ /* change ownership of the vt */
-+ if (chown(vtname, getuid(), getgid()) < 0)
-+ xf86Msg(X_WARNING,"xf86OpenConsole: chown %s failed: %s\n",
-+ vtname, strerror(errno));
-+
-+ /*
-+ * the current VT device we're running on is not
-+ * "console", we want to grab all consoles too
-+ *
-+ * Why is this needed??
-+ */
-+ if (chown("/dev/tty0", getuid(), getgid()) < 0)
-+ xf86Msg(X_WARNING,"xf86OpenConsole: chown /dev/tty0 failed: %s\n",
-+ strerror(errno));
-+ }
- }
-
- /*
-@@ -433,6 +438,11 @@ xf86ProcessArgument(int argc, char *argv[], int i)
- ShareVTs = TRUE;
- return(1);
- }
-+ if (!strcmp(argv[i], "-nohwaccess"))
-+ {
-+ NoHwAccess = TRUE;
-+ return(1);
-+ }
- if ((argv[i][0] == 'v') && (argv[i][1] == 't'))
- {
- if (sscanf(argv[i], "vt%2d", &VTnum) == 0)
-@@ -454,5 +464,6 @@ xf86UseMsg()
- ErrorF("don't detach controlling tty (for debugging only)\n");
- ErrorF("-novtswitch don't immediately switch to new VT\n");
- ErrorF("-sharevts share VTs with another X server\n");
-+ ErrorF("-nohwaccess don't access hardware ports directly\n");
- return;
- }
-diff --git a/hw/xfree86/os-support/linux/lnx_video.c b/hw/xfree86/os-support/linux/lnx_video.c
-index 688106a..34a845b 100644
---- a/hw/xfree86/os-support/linux/lnx_video.c
-+++ b/hw/xfree86/os-support/linux/lnx_video.c
-@@ -51,6 +51,7 @@
- #define MAP_FAILED ((void *)-1)
- #endif
-
-+extern Bool NoHwAccess;
- static Bool ExtendedEnabled = FALSE;
-
- #ifdef __ia64__
-@@ -509,6 +510,9 @@ xf86EnableIO(void)
- int fd;
- unsigned int ioBase_phys;
- #endif
-+ /* Fake it... */
-+ if (NoHwAccess)
-+ return TRUE;
-
- if (ExtendedEnabled)
- return TRUE;
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_git.bb b/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_git.bb
index 850db49..adefcdb 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_git.bb
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_git.bb
@@ -1,9 +1,11 @@
require xserver-xf86-dri-lite.inc
-SRCREV = "251d0d8090322b2c9dc0c8b7bef001f338d19433"
+LIC_FILES_CHKSUM = "file://COPYING;md5=74df27b6254cc88d2799b5f4f5949c00"
+
+SRCREV = "6689e8add183835274a70ee013e5d3bc8023681f"
PE = "1"
PR = "r0"
-PV = "1.7.99+git${SRCPV}"
+PV = "1.10+git${SRCPV}"
PROTO_DEPS += "xf86driproto dri2proto"
@@ -11,21 +13,12 @@ DEPENDS += "font-util"
RDEPENDS_${PN} += "xkeyboard-config"
-# file://cache-xkbcomp-output-for-fast-start-up.patch;patch=1
-# file://xserver-1.5.0-bg-none-root.patch;patch=1
-# file://xserver-no-root-2.patch;patch=1
-# file://xserver-boottime.patch;patch=1
-# file://xserver-DRI2Swapbuffer.patch;patch=1
-
-
SRC_URI = "git://anongit.freedesktop.org/git/xorg/xserver;protocol=git;branch=master \
- file://nodolt.patch;patch=1 \
- file://crosscompile.patch;patch=1 \
- file://fix_macros1.patch;patch=1"
-# file://libdri-xinerama-symbol.patch;patch=1
+ file://crosscompile.patch; \
+ file://fix_macros1.patch;"
# 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 --enable-dga"
--
1.7.0.4
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 5/5] xserver-xf86-lite: upgrade to from 1.7 RC2 to 1.10.1
2011-05-11 7:27 [PATCH 0/5] recipes upgrade: xserver, sqlite3, xf86-video-intel Yu Ke
` (3 preceding siblings ...)
2011-05-11 7:27 ` [PATCH 4/5] xserver-xf86-dri-lite_git: upgrade to 1.10.2 RC1 snapshot Yu Ke
@ 2011-05-11 7:28 ` Yu Ke
2011-05-11 15:34 ` [PATCH 0/5] recipes upgrade: xserver, sqlite3, xf86-video-intel Richard Purdie
5 siblings, 0 replies; 7+ messages in thread
From: Yu Ke @ 2011-05-11 7:28 UTC (permalink / raw)
To: openembedded-core
From: Yu Ke <ke.yu@intel.com>
- remove the following patches, since they are already in upstream
xserver-xf86-lite/libdri-xinerama-symbol.patch,
xserver-xf86-lite/drmfix.patch
xserver-xf86-lite/nodolt.patch
xserver-xf86-lite/revert_make_sys_c_use_unaligned_access_functions.patch
- rebase the patch for 1.10.1
xserver-xf86-lite/crosscompile.patch
Signed-off-by: Yu Ke <ke.yu@intel.com>
---
.../xserver-xf86-lite/crosscompile.patch | 35 ++--
.../xorg-xserver/xserver-xf86-lite/drmfix.patch | 13 -
.../xserver-xf86-lite/libdri-xinerama-symbol.patch | 50 ----
.../xserver-xf86-lite/macro_tweak.patch | 30 +++
.../xorg-xserver/xserver-xf86-lite/nodolt.patch | 12 -
...make_sys_c_use_unaligned_access_functions.patch | 256 --------------------
.../xorg-xserver/xserver-xf86-lite_1.10.1.bb | 12 +
.../xorg-xserver/xserver-xf86-lite_1.7.99.2.bb | 12 -
8 files changed, 61 insertions(+), 359 deletions(-)
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/drmfix.patch
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/libdri-xinerama-symbol.patch
create mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/macro_tweak.patch
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/nodolt.patch
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/revert_make_sys_c_use_unaligned_access_functions.patch
create mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xf86-lite_1.10.1.bb
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xf86-lite_1.7.99.2.bb
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/crosscompile.patch b/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/crosscompile.patch
index 2341e40..2f98bb8 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/crosscompile.patch
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/crosscompile.patch
@@ -1,19 +1,22 @@
-Index: xorg-server-1.7.99.2/configure.ac
-===================================================================
---- xorg-server-1.7.99.2.orig/configure.ac 2010-01-29 16:38:49.000000000 +0000
-+++ xorg-server-1.7.99.2/configure.ac 2010-01-29 16:42:39.000000000 +0000
-@@ -503,14 +503,10 @@
-
- dnl Uses --default-font-path if set, otherwise checks for /etc/X11/fontpath.d,
- dnl otherwise uses standard subdirectories of FONTROOTDIR
--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
- darwin*) DEFAULT_FONT_PATH="${DEFAULT_FONT_PATH},/Library/Fonts,/System/Library/Fonts" ;;
- esac
-- ])
+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-xf86-lite/drmfix.patch b/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/drmfix.patch
deleted file mode 100644
index a62a767..0000000
--- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/drmfix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: xorg-server-1.4/hw/xfree86/os-support/linux/Makefile.am
-===================================================================
---- xorg-server-1.4.orig/hw/xfree86/os-support/linux/Makefile.am 2007-08-23 21:04:53.000000000 +0200
-+++ xorg-server-1.4/hw/xfree86/os-support/linux/Makefile.am 2008-03-13 18:27:23.000000000 +0100
-@@ -41,7 +41,7 @@
-
- AM_CFLAGS = -DUSESTDRES -DHAVE_SYSV_IPC $(DIX_CFLAGS) $(XORG_CFLAGS) $(PLATFORM_DEFINES)
-
--INCLUDES = $(XORG_INCS) $(PLATFORM_INCLUDES) -I/usr/include/drm # FIXME this last part is crack
-+INCLUDES = $(XORG_INCS) $(PLATFORM_INCLUDES) $(LIBDRM_CFLAGS)
-
- # FIXME: These need to be added to the build
- LNX_EXTRA_SRCS = \
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/libdri-xinerama-symbol.patch b/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/libdri-xinerama-symbol.patch
deleted file mode 100644
index db29da9..0000000
--- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/libdri-xinerama-symbol.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-Index: xorg-server-1.5.0/hw/xfree86/dri/dri.c
-===================================================================
---- xorg-server-1.5.0.orig/hw/xfree86/dri/dri.c 2008-09-24 17:43:04.000000000 +0100
-+++ xorg-server-1.5.0/hw/xfree86/dri/dri.c 2008-09-24 17:46:38.000000000 +0100
-@@ -73,10 +73,6 @@
-
- #define PCI_BUS_NO_DOMAIN(bus) ((bus) & 0xffu)
-
--#if !defined(PANORAMIX)
--extern Bool noPanoramiXExtension;
--#endif
--
- static int DRIEntPrivIndex = -1;
- static DevPrivateKey DRIScreenPrivKey = &DRIScreenPrivKey;
- static DevPrivateKey DRIWindowPrivKey = &DRIWindowPrivKey;
-@@ -307,7 +303,6 @@
- drm_context_t * reserved;
- int reserved_count;
- int i;
-- Bool xineramaInCore = FALSE;
- DRIEntPrivPtr pDRIEntPriv;
- ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
- DRIContextFlags flags = 0;
-@@ -320,20 +315,13 @@
- return FALSE;
- }
-
-- /*
-- * If Xinerama is on, don't allow DRI to initialise. It won't be usable
-- * anyway.
-- */
-- if (xf86LoaderCheckSymbol("noPanoramiXExtension"))
-- xineramaInCore = TRUE;
--
-- if (xineramaInCore) {
-- if (!noPanoramiXExtension) {
-- DRIDrvMsg(pScreen->myNum, X_WARNING,
-- "Direct rendering is not supported when Xinerama is enabled\n");
-- return FALSE;
-- }
-+#if defined(PANORAMIX)
-+ if (!noPanoramiXExtension) {
-+ DRIDrvMsg(pScreen->myNum, X_WARNING,
-+ "Direct rendering is not supported when Xinerama is enabled\n");
-+ return FALSE;
- }
-+#endif
-
- if (!DRIOpenDRMMaster(pScrn, pDRIInfo->SAREASize,
- pDRIInfo->busIdString,
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/macro_tweak.patch b/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/macro_tweak.patch
new file mode 100644
index 0000000..2b75427
--- /dev/null
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/macro_tweak.patch
@@ -0,0 +1,30 @@
+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.
+
+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
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/nodolt.patch b/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/nodolt.patch
deleted file mode 100644
index 6b34032..0000000
--- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/nodolt.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: git/configure.ac
-===================================================================
---- git.orig/configure.ac 2009-01-15 20:35:31.000000000 +0000
-+++ git/configure.ac 2009-01-15 20:35:38.000000000 +0000
-@@ -62,7 +62,6 @@
- AC_LIBTOOL_WIN32_DLL
- AC_DISABLE_STATIC
- AC_PROG_LIBTOOL
--DOLT
- AC_PROG_MAKE_SET
- PKG_PROG_PKG_CONFIG
- AC_PROG_LEX
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/revert_make_sys_c_use_unaligned_access_functions.patch b/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/revert_make_sys_c_use_unaligned_access_functions.patch
deleted file mode 100644
index 235b551..0000000
--- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/revert_make_sys_c_use_unaligned_access_functions.patch
+++ /dev/null
@@ -1,256 +0,0 @@
-From 74ab27f64a747ee45810f99cdc6e29b82cf8035e Mon Sep 17 00:00:00 2001
-From: Tiago Vignatti <tiago.vignatti@nokia.com>
-Date: Mon, 28 Dec 2009 16:00:28 +0000
-Subject: Revert "Make sys.c use unaligned access functions provided in compiler."
-
-This reverts commit da923d0bc15e99a8ed1986bd6f5df37f7af7284b.
-
-Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
-Signed-off-by: Keith Packard <keithp@keithp.com>
----
-diff --git a/hw/xfree86/x86emu/Makefile.am b/hw/xfree86/x86emu/Makefile.am
-index e7368f5..df96977 100644
---- a/hw/xfree86/x86emu/Makefile.am
-+++ b/hw/xfree86/x86emu/Makefile.am
-@@ -11,7 +11,7 @@ libx86emu_la_SOURCES = debug.c \
- sys.c \
- x86emu.h
-
--INCLUDES = $(XORG_INCS)
-+INCLUDES =
-
- AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS)
-
-diff --git a/hw/xfree86/x86emu/sys.c b/hw/xfree86/x86emu/sys.c
-index 2ebf6f1..e15fb09 100644
---- a/hw/xfree86/x86emu/sys.c
-+++ b/hw/xfree86/x86emu/sys.c
-@@ -48,13 +48,168 @@
- #ifndef NO_SYS_HEADERS
- #include <string.h>
- #endif
--#include "compiler.h" /* for unaligned access functions */
- /*------------------------- Global Variables ------------------------------*/
-
- X86EMU_sysEnv _X86EMU_env; /* Global emulator machine state */
- X86EMU_intrFuncs _X86EMU_intrTab[256];
-
- /*----------------------------- Implementation ----------------------------*/
-+#if defined(__alpha__) || defined(__alpha)
-+/* to cope with broken egcs-1.1.2 :-(((( */
-+
-+#define ALPHA_UALOADS
-+/*
-+ * inline functions to do unaligned accesses
-+ * from linux/include/asm-alpha/unaligned.h
-+ */
-+
-+/*
-+ * EGCS 1.1 knows about arbitrary unaligned loads. Define some
-+ * packed structures to talk about such things with.
-+ */
-+
-+#if defined(__GNUC__)
-+struct __una_u64 { unsigned long x __attribute__((packed)); };
-+struct __una_u32 { unsigned int x __attribute__((packed)); };
-+struct __una_u16 { unsigned short x __attribute__((packed)); };
-+#endif
-+
-+static __inline__ unsigned long ldq_u(unsigned long * r11)
-+{
-+#if defined(__GNUC__)
-+ const struct __una_u64 *ptr = (const struct __una_u64 *) r11;
-+ return ptr->x;
-+#else
-+ unsigned long r1,r2;
-+ __asm__("ldq_u %0,%3\n\t"
-+ "ldq_u %1,%4\n\t"
-+ "extql %0,%2,%0\n\t"
-+ "extqh %1,%2,%1"
-+ :"=&r" (r1), "=&r" (r2)
-+ :"r" (r11),
-+ "m" (*r11),
-+ "m" (*(const unsigned long *)(7+(char *) r11)));
-+ return r1 | r2;
-+#endif
-+}
-+
-+static __inline__ unsigned long ldl_u(unsigned int * r11)
-+{
-+#if defined(__GNUC__)
-+ const struct __una_u32 *ptr = (const struct __una_u32 *) r11;
-+ return ptr->x;
-+#else
-+ unsigned long r1,r2;
-+ __asm__("ldq_u %0,%3\n\t"
-+ "ldq_u %1,%4\n\t"
-+ "extll %0,%2,%0\n\t"
-+ "extlh %1,%2,%1"
-+ :"=&r" (r1), "=&r" (r2)
-+ :"r" (r11),
-+ "m" (*r11),
-+ "m" (*(const unsigned long *)(3+(char *) r11)));
-+ return r1 | r2;
-+#endif
-+}
-+
-+static __inline__ unsigned long ldw_u(unsigned short * r11)
-+{
-+#if defined(__GNUC__)
-+ const struct __una_u16 *ptr = (const struct __una_u16 *) r11;
-+ return ptr->x;
-+#else
-+ unsigned long r1,r2;
-+ __asm__("ldq_u %0,%3\n\t"
-+ "ldq_u %1,%4\n\t"
-+ "extwl %0,%2,%0\n\t"
-+ "extwh %1,%2,%1"
-+ :"=&r" (r1), "=&r" (r2)
-+ :"r" (r11),
-+ "m" (*r11),
-+ "m" (*(const unsigned long *)(1+(char *) r11)));
-+ return r1 | r2;
-+#endif
-+}
-+
-+/*
-+ * Elemental unaligned stores
-+ */
-+
-+static __inline__ void stq_u(unsigned long r5, unsigned long * r11)
-+{
-+#if defined(__GNUC__)
-+ struct __una_u64 *ptr = (struct __una_u64 *) r11;
-+ ptr->x = r5;
-+#else
-+ unsigned long r1,r2,r3,r4;
-+
-+ __asm__("ldq_u %3,%1\n\t"
-+ "ldq_u %2,%0\n\t"
-+ "insqh %6,%7,%5\n\t"
-+ "insql %6,%7,%4\n\t"
-+ "mskqh %3,%7,%3\n\t"
-+ "mskql %2,%7,%2\n\t"
-+ "bis %3,%5,%3\n\t"
-+ "bis %2,%4,%2\n\t"
-+ "stq_u %3,%1\n\t"
-+ "stq_u %2,%0"
-+ :"=m" (*r11),
-+ "=m" (*(unsigned long *)(7+(char *) r11)),
-+ "=&r" (r1), "=&r" (r2), "=&r" (r3), "=&r" (r4)
-+ :"r" (r5), "r" (r11));
-+#endif
-+}
-+
-+static __inline__ void stl_u(unsigned long r5, unsigned int * r11)
-+{
-+#if defined(__GNUC__)
-+ struct __una_u32 *ptr = (struct __una_u32 *) r11;
-+ ptr->x = r5;
-+#else
-+ unsigned long r1,r2,r3,r4;
-+
-+ __asm__("ldq_u %3,%1\n\t"
-+ "ldq_u %2,%0\n\t"
-+ "inslh %6,%7,%5\n\t"
-+ "insll %6,%7,%4\n\t"
-+ "msklh %3,%7,%3\n\t"
-+ "mskll %2,%7,%2\n\t"
-+ "bis %3,%5,%3\n\t"
-+ "bis %2,%4,%2\n\t"
-+ "stq_u %3,%1\n\t"
-+ "stq_u %2,%0"
-+ :"=m" (*r11),
-+ "=m" (*(unsigned long *)(3+(char *) r11)),
-+ "=&r" (r1), "=&r" (r2), "=&r" (r3), "=&r" (r4)
-+ :"r" (r5), "r" (r11));
-+#endif
-+}
-+
-+static __inline__ void stw_u(unsigned long r5, unsigned short * r11)
-+{
-+#if defined(__GNUC__)
-+ struct __una_u16 *ptr = (struct __una_u16 *) r11;
-+ ptr->x = r5;
-+#else
-+ unsigned long r1,r2,r3,r4;
-+
-+ __asm__("ldq_u %3,%1\n\t"
-+ "ldq_u %2,%0\n\t"
-+ "inswh %6,%7,%5\n\t"
-+ "inswl %6,%7,%4\n\t"
-+ "mskwh %3,%7,%3\n\t"
-+ "mskwl %2,%7,%2\n\t"
-+ "bis %3,%5,%3\n\t"
-+ "bis %2,%4,%2\n\t"
-+ "stq_u %3,%1\n\t"
-+ "stq_u %2,%0"
-+ :"=m" (*r11),
-+ "=m" (*(unsigned long *)(1+(char *) r11)),
-+ "=&r" (r1), "=&r" (r2), "=&r" (r3), "=&r" (r4)
-+ :"r" (r5), "r" (r11));
-+#endif
-+}
-+#endif
-
- /****************************************************************************
- PARAMETERS:
-@@ -107,7 +262,13 @@ u16 X86API rdw(
- }
- else
- #endif
-+#if defined(ALPHA_UALOADS)
- val = ldw_u((u16*)(M.mem_base + addr));
-+#elif defined(IA64_UALOADS)
-+ val = uldw((u16*)(M.mem_base + addr));
-+#else
-+ val = *(u16*)(M.mem_base + addr);
-+#endif
- DB( if (DEBUG_MEM_TRACE())
- printk("%#08x 2 -> %#x\n", addr, val);)
- return val;
-@@ -140,7 +301,13 @@ u32 X86API rdl(
- }
- else
- #endif
-+#if defined(ALPHA_UALOADS)
- val = ldl_u((u32*)(M.mem_base + addr));
-+#elif defined(IA64_UALOADS)
-+ val = uldl((u32*)(M.mem_base + addr));
-+#else
-+ val = *(u32*)(M.mem_base + addr);
-+#endif
- DB( if (DEBUG_MEM_TRACE())
- printk("%#08x 4 -> %#x\n", addr, val);)
- return val;
-@@ -192,7 +359,13 @@ DB( if (DEBUG_MEM_TRACE())
- }
- else
- #endif
-+#if defined(ALPHA_UALOADS)
- stw_u(val,(u16*)(M.mem_base + addr));
-+#elif defined(IA64_UALOADS)
-+ ustw(val,(u16*)(M.mem_base + addr));
-+#else
-+ *(u16*)(M.mem_base + addr) = val;
-+#endif
- }
-
- /****************************************************************************
-@@ -222,7 +395,13 @@ DB( if (DEBUG_MEM_TRACE())
- }
- else
- #endif
-+#if defined(ALPHA_UALOADS)
- stl_u(val,(u32*)(M.mem_base + addr));
-+#elif defined(IA64_UALOADS)
-+ ustl(val,(u32*)(M.mem_base + addr));
-+#else
-+ *(u32*)(M.mem_base + addr) = val;
-+#endif
- }
-
- /****************************************************************************
---
-cgit v0.8.3-6-g21f6
-
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite_1.10.1.bb b/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite_1.10.1.bb
new file mode 100644
index 0000000..f9b3a64
--- /dev/null
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite_1.10.1.bb
@@ -0,0 +1,12 @@
+require xserver-xf86-lite.inc
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=74df27b6254cc88d2799b5f4f5949c00"
+
+PR = "r0"
+
+DEPENDS += "font-util"
+
+SRC_URI += "file://crosscompile.patch"
+
+# Misc build failure for master HEAD
+SRC_URI += "file://fix_open_max_preprocessor_error.patch;"
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite_1.7.99.2.bb b/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite_1.7.99.2.bb
deleted file mode 100644
index 5ef2301..0000000
--- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite_1.7.99.2.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-require xserver-xf86-lite.inc
-
-PR = "r1"
-
-DEPENDS += "font-util"
-
-SRC_URI += "file://nodolt.patch;patch=1 \
- file://crosscompile.patch;patch=1"
-
-# Misc build failure for master HEAD
-SRC_URI += "file://fix_open_max_preprocessor_error.patch;patch=1 \
- file://revert_make_sys_c_use_unaligned_access_functions.patch;patch=1"
--
1.7.0.4
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH 0/5] recipes upgrade: xserver, sqlite3, xf86-video-intel
2011-05-11 7:27 [PATCH 0/5] recipes upgrade: xserver, sqlite3, xf86-video-intel Yu Ke
` (4 preceding siblings ...)
2011-05-11 7:28 ` [PATCH 5/5] xserver-xf86-lite: upgrade to from 1.7 RC2 to 1.10.1 Yu Ke
@ 2011-05-11 15:34 ` Richard Purdie
5 siblings, 0 replies; 7+ messages in thread
From: Richard Purdie @ 2011-05-11 15:34 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Wed, 2011-05-11 at 15:27 +0800, Yu Ke wrote:
> From: Yu Ke <ke.yu@intel.com>
>
> Test with qemux86, qemuarm, and atom-pc
>
> Pull URL: git://git.pokylinux.org/poky-contrib.git
> Branch: kyu3/upgrade-05-11
> Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=kyu3/upgrade-05-11
>
> Thanks,
> Yu Ke <ke.yu@intel.com>
> ---
>
>
> Yu Ke (5):
> xf86-video-intel: upgrade from 2.14.0 to 2.15.0
> sqlite: upgrade from 3.7.5 to 3.7.6.2
> xserver-xf86-dri-lite: upgrade from 1.9.3 to 1.10.1
> xserver-xf86-dri-lite_git: upgrade to 1.10.2 RC1 snapshot
> xserver-xf86-lite: upgrade to from 1.7 RC2 to 1.10.1
Merged to master, thanks.
Richard
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2011-05-11 15:37 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-05-11 7:27 [PATCH 0/5] recipes upgrade: xserver, sqlite3, xf86-video-intel Yu Ke
2011-05-11 7:27 ` [PATCH 1/5] xf86-video-intel: upgrade from 2.14.0 to 2.15.0 Yu Ke
2011-05-11 7:27 ` [PATCH 2/5] sqlite: upgrade from 3.7.5 to 3.7.6.2 Yu Ke
2011-05-11 7:27 ` [PATCH 3/5] xserver-xf86-dri-lite: upgrade from 1.9.3 to 1.10.1 Yu Ke
2011-05-11 7:27 ` [PATCH 4/5] xserver-xf86-dri-lite_git: upgrade to 1.10.2 RC1 snapshot Yu Ke
2011-05-11 7:28 ` [PATCH 5/5] xserver-xf86-lite: upgrade to from 1.7 RC2 to 1.10.1 Yu Ke
2011-05-11 15:34 ` [PATCH 0/5] recipes upgrade: xserver, sqlite3, xf86-video-intel Richard Purdie
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox