* [PATCH 5/5] pixman: upgrade from 0.18.2 to 0.20.0
2010-11-18 16:30 [PATCH 0/5] upgrade xserver v2 Yu Ke
@ 2010-11-15 13:01 ` Yu Ke
2010-11-16 6:39 ` [PATCH 1/5] libdrm: upgrade from 2.4.21 to 2.4.22 Yu Ke
` (4 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Yu Ke @ 2010-11-15 13:01 UTC (permalink / raw)
To: poky
Signed-off-by: Yu Ke <ke.yu@intel.com>
---
.../distro/include/preferred-xorg-versions.inc | 2 +-
.../{pixman_0.18.2.bb => pixman_0.20.0.bb} | 3 +++
2 files changed, 4 insertions(+), 1 deletions(-)
rename meta/recipes-graphics/xorg-lib/{pixman_0.18.2.bb => pixman_0.20.0.bb} (80%)
diff --git a/meta/conf/distro/include/preferred-xorg-versions.inc b/meta/conf/distro/include/preferred-xorg-versions.inc
index afa3422..b93d0f4 100644
--- a/meta/conf/distro/include/preferred-xorg-versions.inc
+++ b/meta/conf/distro/include/preferred-xorg-versions.inc
@@ -83,7 +83,7 @@ PREFERRED_VERSION_libxxf86vm ?= "1.1.0"
PREFERRED_VERSION_lndir ?= "1.0.1"
PREFERRED_VERSION_makedepend ?= "1.0.2"
PREFERRED_VERSION_makedepend-native ?= "1.0.2"
-PREFERRED_VERSION_pixman ?= "0.18.2"
+PREFERRED_VERSION_pixman ?= "0.20.0"
PREFERRED_VERSION_printproto ?= "1.0.4"
PREFERRED_VERSION_randrproto ?= "1.3.1"
PREFERRED_VERSION_randrproto-nativesdk ?= "1.3.1"
diff --git a/meta/recipes-graphics/xorg-lib/pixman_0.18.2.bb b/meta/recipes-graphics/xorg-lib/pixman_0.20.0.bb
similarity index 80%
rename from meta/recipes-graphics/xorg-lib/pixman_0.18.2.bb
rename to meta/recipes-graphics/xorg-lib/pixman_0.20.0.bb
index 3bc1f02..0ccadcd 100644
--- a/meta/recipes-graphics/xorg-lib/pixman_0.18.2.bb
+++ b/meta/recipes-graphics/xorg-lib/pixman_0.20.0.bb
@@ -13,3 +13,6 @@ DEPENDS = "virtual/libx11"
PR="r0"
EXTRA_OECONF="--disable-gtk"
+
+SRC_URI[md5sum] = "512ec766a911142b901157ba581f6e75"
+SRC_URI[sha256sum] = "4798a9961bf38a1b25cabef0a8a73fd7dcc6b98da187ce55b1420894360188b5"
--
1.7.0.4
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH 1/5] libdrm: upgrade from 2.4.21 to 2.4.22
2010-11-18 16:30 [PATCH 0/5] upgrade xserver v2 Yu Ke
2010-11-15 13:01 ` [PATCH 5/5] pixman: upgrade from 0.18.2 to 0.20.0 Yu Ke
@ 2010-11-16 6:39 ` Yu Ke
2010-11-16 13:25 ` [PATCH 3/5] xserver-xf86-dri-lite: upgrade from 1.9.0 rc4 to 1.9.2 Yu Ke
` (3 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Yu Ke @ 2010-11-16 6:39 UTC (permalink / raw)
To: poky
Signed-off-by: Yu Ke <ke.yu@intel.com>
---
.../distro/include/preferred-xorg-versions.inc | 2 +-
.../installtests.patch | 0
meta/recipes-graphics/drm/libdrm_2.4.21.bb | 4 ----
meta/recipes-graphics/drm/libdrm_2.4.22.bb | 7 +++++++
4 files changed, 8 insertions(+), 5 deletions(-)
rename meta/recipes-graphics/drm/{libdrm-2.4.21 => libdrm-2.4.22}/installtests.patch (100%)
delete mode 100644 meta/recipes-graphics/drm/libdrm_2.4.21.bb
create mode 100644 meta/recipes-graphics/drm/libdrm_2.4.22.bb
diff --git a/meta/conf/distro/include/preferred-xorg-versions.inc b/meta/conf/distro/include/preferred-xorg-versions.inc
index 64dbadd..506d214 100644
--- a/meta/conf/distro/include/preferred-xorg-versions.inc
+++ b/meta/conf/distro/include/preferred-xorg-versions.inc
@@ -137,7 +137,7 @@ PREFERRED_VERSION_xtrans-nativesdk ?= "1.2.5"
PREFERRED_VERSION_xvinfo ?= "1.0.2"
PREFERRED_VERSION_xwininfo ?= "1.1.0"
PREFERRED_VERSION_mesa-dri ?= "7.8.2"
-PREFERRED_VERSION_libdrm ?= "2.4.21"
+PREFERRED_VERSION_libdrm ?= "2.4.22"
PREFERRED_VERSION_xcb-proto ?= "1.6"
PREFERRED_VERSION_libxcb ?= "1.6"
PREFERRED_VERSION_libxcb-nativesdk ?= "1.6"
diff --git a/meta/recipes-graphics/drm/libdrm-2.4.21/installtests.patch b/meta/recipes-graphics/drm/libdrm-2.4.22/installtests.patch
similarity index 100%
rename from meta/recipes-graphics/drm/libdrm-2.4.21/installtests.patch
rename to meta/recipes-graphics/drm/libdrm-2.4.22/installtests.patch
diff --git a/meta/recipes-graphics/drm/libdrm_2.4.21.bb b/meta/recipes-graphics/drm/libdrm_2.4.21.bb
deleted file mode 100644
index 97ca069..0000000
--- a/meta/recipes-graphics/drm/libdrm_2.4.21.bb
+++ /dev/null
@@ -1,4 +0,0 @@
-require libdrm.inc
-
-SRC_URI += "file://installtests.patch"
-PR = "r0"
diff --git a/meta/recipes-graphics/drm/libdrm_2.4.22.bb b/meta/recipes-graphics/drm/libdrm_2.4.22.bb
new file mode 100644
index 0000000..e0c0f01
--- /dev/null
+++ b/meta/recipes-graphics/drm/libdrm_2.4.22.bb
@@ -0,0 +1,7 @@
+require libdrm.inc
+
+SRC_URI += "file://installtests.patch"
+SRC_URI[md5sum] = "3bdfa33f35d1c902e5115cceb5500c83"
+SRC_URI[sha256sum] = "0bb0e594e4094d9000d80f38e96e8f640b6364f96cfef5b970cf4481443c6b3d"
+
+PR = "r0"
--
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.0 rc4 to 1.9.2
2010-11-18 16:30 [PATCH 0/5] upgrade xserver v2 Yu Ke
2010-11-15 13:01 ` [PATCH 5/5] pixman: upgrade from 0.18.2 to 0.20.0 Yu Ke
2010-11-16 6:39 ` [PATCH 1/5] libdrm: upgrade from 2.4.21 to 2.4.22 Yu Ke
@ 2010-11-16 13:25 ` Yu Ke
2010-11-16 13:50 ` [PATCH 2/5] xf86-video-intel: upgrade from 2.12.0 to 2.13.0 Yu Ke
` (2 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Yu Ke @ 2010-11-16 13:25 UTC (permalink / raw)
To: poky
Signed-off-by: Yu Ke <ke.yu@intel.com>
---
.../distro/include/preferred-xorg-versions.inc | 2 +-
....8.99.904.bb => xserver-xf86-dri-lite_1.9.2.bb} | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
rename meta/recipes-graphics/xorg-xserver/{xserver-xf86-dri-lite_1.8.99.904.bb => xserver-xf86-dri-lite_1.9.2.bb} (76%)
diff --git a/meta/conf/distro/include/preferred-xorg-versions.inc b/meta/conf/distro/include/preferred-xorg-versions.inc
index a042e35..d49eacf 100644
--- a/meta/conf/distro/include/preferred-xorg-versions.inc
+++ b/meta/conf/distro/include/preferred-xorg-versions.inc
@@ -129,7 +129,7 @@ PREFERRED_VERSION_xproxymanagementprotocol ?= "1.0.3"
PREFERRED_VERSION_xrandr ?= "1.3.2"
PREFERRED_VERSION_xrdb ?= "1.0.5"
PREFERRED_VERSION_xserver-kdrive ?= "1.7.99.2"
-PREFERRED_VERSION_xserver-xf86-dri-lite ?= "1.8.99.904"
+PREFERRED_VERSION_xserver-xf86-dri-lite ?= "1.9.2"
PREFERRED_VERSION_xset ?= "1.2.1"
PREFERRED_VERSION_xtrans ?= "1.2.5"
PREFERRED_VERSION_xtrans-native ?= "1.2.5"
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_1.8.99.904.bb b/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_1.9.2.bb
similarity index 76%
rename from meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_1.8.99.904.bb
rename to meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_1.9.2.bb
index 98d79a1..0433fe3 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_1.8.99.904.bb
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_1.9.2.bb
@@ -7,7 +7,7 @@ PROTO_DEPS += "xf86driproto dri2proto"
DEPENDS += "font-util"
PE = "1"
-PR = "r1"
+PR = "r0"
SRC_URI += "file://nodolt.patch \
file://crosscompile.patch"
@@ -17,4 +17,7 @@ SRC_URI += "file://nodolt.patch \
# Misc build failure for master HEAD
SRC_URI += "file://fix_open_max_preprocessor_error.patch"
+SRC_URI[md5sum] = "5c8773499a6a8c1ddaedf33577ec9634"
+SRC_URI[sha256sum] = "8b30800004c98fc7a8e6ff31a339f28451be5132e774443be22bf226e1791e34"
+
EXTRA_OECONF += "--enable-dri --enable-dri2"
--
1.7.0.4
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH 2/5] xf86-video-intel: upgrade from 2.12.0 to 2.13.0
2010-11-18 16:30 [PATCH 0/5] upgrade xserver v2 Yu Ke
` (2 preceding siblings ...)
2010-11-16 13:25 ` [PATCH 3/5] xserver-xf86-dri-lite: upgrade from 1.9.0 rc4 to 1.9.2 Yu Ke
@ 2010-11-16 13:50 ` Yu Ke
2010-11-16 13:58 ` [PATCH 4/5] xrandr: upgrade from 1.3.2 to 1.3.4 Yu Ke
2010-11-22 17:49 ` [PATCH 0/5] upgrade xserver v2 Saul Wold
5 siblings, 0 replies; 7+ messages in thread
From: Yu Ke @ 2010-11-16 13:50 UTC (permalink / raw)
To: poky
Signed-off-by: Yu Ke <ke.yu@intel.com>
---
.../distro/include/preferred-xorg-versions.inc | 2 +-
...-intel_2.12.0.bb => xf86-video-intel_2.13.0.bb} | 3 +++
2 files changed, 4 insertions(+), 1 deletions(-)
rename meta/recipes-graphics/xorg-driver/{xf86-video-intel_2.12.0.bb => xf86-video-intel_2.13.0.bb} (67%)
diff --git a/meta/conf/distro/include/preferred-xorg-versions.inc b/meta/conf/distro/include/preferred-xorg-versions.inc
index 506d214..a042e35 100644
--- a/meta/conf/distro/include/preferred-xorg-versions.inc
+++ b/meta/conf/distro/include/preferred-xorg-versions.inc
@@ -146,6 +146,6 @@ PREFERRED_VERSION_xf86-input-evdev ?= "2.5.0"
PREFERRED_VERSION_xf86-input-mouse ?= "1.6.0"
PREFERRED_VERSION_xf86-input-keyboard ?= "1.4.0"
PREFERRED_VERSION_xf86-input-synaptics ?= "1.2.1"
-PREFERRED_VERSION_xf86-video-intel ?= "2.12.0"
+PREFERRED_VERSION_xf86-video-intel ?= "2.13.0"
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.12.0.bb b/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.13.0.bb
similarity index 67%
rename from meta/recipes-graphics/xorg-driver/xf86-video-intel_2.12.0.bb
rename to meta/recipes-graphics/xorg-driver/xf86-video-intel_2.13.0.bb
index 968c201..f902005 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.12.0.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.13.0.bb
@@ -8,3 +8,6 @@ DEPENDS += "virtual/libx11 libxvmc drm xf86driproto glproto \
virtual/libgl xineramaproto xf86driproto libpciaccess"
COMPATIBLE_HOST = '(i.86|x86_64).*-linux'
+
+SRC_URI[md5sum] = "de2f8a5836d90c71f3175dcd46d03ec0"
+SRC_URI[sha256sum] = "d8b2fae8d0c4ae372994cb7df8de8aa995b8e89b1bc5766c53ea0751752fc887"
--
1.7.0.4
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH 4/5] xrandr: upgrade from 1.3.2 to 1.3.4
2010-11-18 16:30 [PATCH 0/5] upgrade xserver v2 Yu Ke
` (3 preceding siblings ...)
2010-11-16 13:50 ` [PATCH 2/5] xf86-video-intel: upgrade from 2.12.0 to 2.13.0 Yu Ke
@ 2010-11-16 13:58 ` Yu Ke
2010-11-22 17:49 ` [PATCH 0/5] upgrade xserver v2 Saul Wold
5 siblings, 0 replies; 7+ messages in thread
From: Yu Ke @ 2010-11-16 13:58 UTC (permalink / raw)
To: poky
Also remove the patch resolve_symbol_clash.patch,
because the code it applies to has been removed from
1.3.4, by commit ccb3f8a42b: "Remove --clone / --extend
support code", so this patch is no longer needed.
Signed-off-by: Yu Ke <ke.yu@intel.com>
---
.../distro/include/preferred-xorg-versions.inc | 2 +-
.../xorg-app/xrandr/resolve_symbol_clash.patch | 33 --------------------
.../xorg-app/{xrandr_1.3.2.bb => xrandr_1.3.4.bb} | 3 +-
3 files changed, 3 insertions(+), 35 deletions(-)
delete mode 100644 meta/recipes-graphics/xorg-app/xrandr/resolve_symbol_clash.patch
rename meta/recipes-graphics/xorg-app/{xrandr_1.3.2.bb => xrandr_1.3.4.bb} (61%)
diff --git a/meta/conf/distro/include/preferred-xorg-versions.inc b/meta/conf/distro/include/preferred-xorg-versions.inc
index d49eacf..afa3422 100644
--- a/meta/conf/distro/include/preferred-xorg-versions.inc
+++ b/meta/conf/distro/include/preferred-xorg-versions.inc
@@ -126,7 +126,7 @@ PREFERRED_VERSION_xproto ?= "7.0.17"
PREFERRED_VERSION_xproto-native ?= "7.0.17"
PREFERRED_VERSION_xproto-nativesdk ?= "7.0.17"
PREFERRED_VERSION_xproxymanagementprotocol ?= "1.0.3"
-PREFERRED_VERSION_xrandr ?= "1.3.2"
+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.2"
diff --git a/meta/recipes-graphics/xorg-app/xrandr/resolve_symbol_clash.patch b/meta/recipes-graphics/xorg-app/xrandr/resolve_symbol_clash.patch
deleted file mode 100644
index 1ecf956..0000000
--- a/meta/recipes-graphics/xorg-app/xrandr/resolve_symbol_clash.patch
+++ /dev/null
@@ -1,33 +0,0 @@
----
- xrandr.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
---- xrandr-1.2.2.orig/xrandr.c
-+++ xrandr-1.2.2/xrandr.c
-@@ -189,7 +189,7 @@
-
- #if HAS_RANDR_1_2
- typedef enum _policy {
-- clone, extend
-+ policy_clone, extend
- } policy_t;
-
- typedef enum _relation {
-@@ -1602,7 +1602,7 @@
- int ret = 0;
- #if HAS_RANDR_1_2
- output_t *output = NULL;
-- policy_t policy = clone;
-+ policy_t policy = policy_clone;
- Bool setit_1_2 = False;
- Bool query_1_2 = False;
- Bool modeit = False;
-@@ -1863,7 +1863,7 @@
- continue;
- }
- if (!strcmp ("--clone", argv[i])) {
-- policy = clone;
-+ policy = policy_clone;
- setit_1_2 = True;
- continue;
- }
diff --git a/meta/recipes-graphics/xorg-app/xrandr_1.3.2.bb b/meta/recipes-graphics/xorg-app/xrandr_1.3.4.bb
similarity index 61%
rename from meta/recipes-graphics/xorg-app/xrandr_1.3.2.bb
rename to meta/recipes-graphics/xorg-app/xrandr_1.3.4.bb
index 3ddccb2..9a6e470 100644
--- a/meta/recipes-graphics/xorg-app/xrandr_1.3.2.bb
+++ b/meta/recipes-graphics/xorg-app/xrandr_1.3.4.bb
@@ -7,4 +7,5 @@ DEPENDS += "libxrandr libxrender"
PE = "1"
PR = "r0"
-SRC_URI += "file://resolve_symbol_clash.patch"
+SRC_URI[md5sum] = "d6d20038257eba5178b523e10239d51c"
+SRC_URI[sha256sum] = "5e4a2492e6cc51345aa571b95283c43c2771c4f444837dbce2699d62f76b4adb"
--
1.7.0.4
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [PATCH 0/5] upgrade xserver v2
2010-11-18 16:30 [PATCH 0/5] upgrade xserver v2 Yu Ke
` (4 preceding siblings ...)
2010-11-16 13:58 ` [PATCH 4/5] xrandr: upgrade from 1.3.2 to 1.3.4 Yu Ke
@ 2010-11-22 17:49 ` Saul Wold
5 siblings, 0 replies; 7+ messages in thread
From: Saul Wold @ 2010-11-22 17:49 UTC (permalink / raw)
To: poky
On 11/18/2010 08:30 AM, Yu Ke wrote:
> accodring to Saul's comments, V2 patch has the following changes
> - add clear explanation on the commit message.
> - correct the license check sum and test it
> against latest poky/master
> - add SRI_URI checksum
> - mesa/cairo related recpies(mesa, talloc, libxml2,cairo) are still hold,
> as one time build failure are observed. Although the failure
> disappers after build again, it is better to find out the reason
> before submitting it.
>
> Pull URL: git://git.pokylinux.org/poky-contrib.git
> Branch: kyu3/upgrade-11-18
> Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=kyu3/upgrade-11-18
>
> Thanks,
> Yu Ke<ke.yu@intel.com>
> ---
>
>
> Yu Ke (5):
> libdrm: upgrade from 2.4.21 to 2.4.22
> xf86-video-intel: upgrade from 2.12.0 to 2.13.0
> xserver-xf86-dri-lite: upgrade from 1.9.0 rc4 to 1.9.2
> xrandr: upgrade from 1.3.2 to 1.3.4
> pixman: upgrade from 0.18.2 to 0.20.0
>
> .../distro/include/preferred-xorg-versions.inc | 10 +++---
> .../installtests.patch | 0
> meta/recipes-graphics/drm/libdrm_2.4.21.bb | 4 --
> meta/recipes-graphics/drm/libdrm_2.4.22.bb | 7 ++++
> .../xorg-app/xrandr/resolve_symbol_clash.patch | 33 --------------------
> .../xorg-app/{xrandr_1.3.2.bb => xrandr_1.3.4.bb} | 3 +-
> ...-intel_2.12.0.bb => xf86-video-intel_2.13.0.bb} | 3 ++
> .../{pixman_0.18.2.bb => pixman_0.20.0.bb} | 3 ++
> ....8.99.904.bb => xserver-xf86-dri-lite_1.9.2.bb} | 5 ++-
> 9 files changed, 24 insertions(+), 44 deletions(-)
> rename meta/recipes-graphics/drm/{libdrm-2.4.21 => libdrm-2.4.22}/installtests.patch (100%)
> delete mode 100644 meta/recipes-graphics/drm/libdrm_2.4.21.bb
> create mode 100644 meta/recipes-graphics/drm/libdrm_2.4.22.bb
> delete mode 100644 meta/recipes-graphics/xorg-app/xrandr/resolve_symbol_clash.patch
> rename meta/recipes-graphics/xorg-app/{xrandr_1.3.2.bb => xrandr_1.3.4.bb} (61%)
> rename meta/recipes-graphics/xorg-driver/{xf86-video-intel_2.12.0.bb => xf86-video-intel_2.13.0.bb} (67%)
> rename meta/recipes-graphics/xorg-lib/{pixman_0.18.2.bb => pixman_0.20.0.bb} (80%)
> rename meta/recipes-graphics/xorg-xserver/{xserver-xf86-dri-lite_1.8.99.904.bb => xserver-xf86-dri-lite_1.9.2.bb} (76%)
>
> _______________________________________________
> poky mailing list
> poky@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/poky
>
Pulled into Master
Thanks
Sau!
^ permalink raw reply [flat|nested] 7+ messages in thread