summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYu Ke <ke.yu@intel.com>2010-11-16 21:58:59 +0800
committerRichard Purdie <rpurdie@linux.intel.com>2010-11-22 10:25:34 +0000
commit161490f1050b4eafb88d173c62d5648c9b852970 (patch)
treeba2129d33443869772b0644f1b1060375257b9e4
parent685cfa94a316cb822f4820ed170410e649cdd250 (diff)
downloadpoky-161490f1050b4eafb88d173c62d5648c9b852970.tar.gz
xrandr: upgrade from 1.3.2 to 1.3.4
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>
-rw-r--r--meta/conf/distro/include/preferred-xorg-versions.inc2
-rw-r--r--meta/recipes-graphics/xorg-app/xrandr/resolve_symbol_clash.patch33
-rw-r--r--meta/recipes-graphics/xorg-app/xrandr_1.3.4.bb (renamed from meta/recipes-graphics/xorg-app/xrandr_1.3.2.bb)3
3 files changed, 3 insertions, 35 deletions
diff --git a/meta/conf/distro/include/preferred-xorg-versions.inc b/meta/conf/distro/include/preferred-xorg-versions.inc
index 90825cd384..5ef90363d9 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"
126PREFERRED_VERSION_xproto-native ?= "7.0.17" 126PREFERRED_VERSION_xproto-native ?= "7.0.17"
127PREFERRED_VERSION_xproto-nativesdk ?= "7.0.17" 127PREFERRED_VERSION_xproto-nativesdk ?= "7.0.17"
128PREFERRED_VERSION_xproxymanagementprotocol ?= "1.0.3" 128PREFERRED_VERSION_xproxymanagementprotocol ?= "1.0.3"
129PREFERRED_VERSION_xrandr ?= "1.3.2" 129PREFERRED_VERSION_xrandr ?= "1.3.4"
130PREFERRED_VERSION_xrdb ?= "1.0.5" 130PREFERRED_VERSION_xrdb ?= "1.0.5"
131PREFERRED_VERSION_xserver-kdrive ?= "1.7.99.2" 131PREFERRED_VERSION_xserver-kdrive ?= "1.7.99.2"
132PREFERRED_VERSION_xserver-xf86-dri-lite ?= "1.9.2" 132PREFERRED_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 1ecf9563f6..0000000000
--- a/meta/recipes-graphics/xorg-app/xrandr/resolve_symbol_clash.patch
+++ /dev/null
@@ -1,33 +0,0 @@
1---
2 xrandr.c | 6 +++---
3 1 file changed, 3 insertions(+), 3 deletions(-)
4
5--- xrandr-1.2.2.orig/xrandr.c
6+++ xrandr-1.2.2/xrandr.c
7@@ -189,7 +189,7 @@
8
9 #if HAS_RANDR_1_2
10 typedef enum _policy {
11- clone, extend
12+ policy_clone, extend
13 } policy_t;
14
15 typedef enum _relation {
16@@ -1602,7 +1602,7 @@
17 int ret = 0;
18 #if HAS_RANDR_1_2
19 output_t *output = NULL;
20- policy_t policy = clone;
21+ policy_t policy = policy_clone;
22 Bool setit_1_2 = False;
23 Bool query_1_2 = False;
24 Bool modeit = False;
25@@ -1863,7 +1863,7 @@
26 continue;
27 }
28 if (!strcmp ("--clone", argv[i])) {
29- policy = clone;
30+ policy = policy_clone;
31 setit_1_2 = True;
32 continue;
33 }
diff --git a/meta/recipes-graphics/xorg-app/xrandr_1.3.2.bb b/meta/recipes-graphics/xorg-app/xrandr_1.3.4.bb
index 3ddccb2496..9a6e4702b9 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"
7PE = "1" 7PE = "1"
8PR = "r0" 8PR = "r0"
9 9
10SRC_URI += "file://resolve_symbol_clash.patch" 10SRC_URI[md5sum] = "d6d20038257eba5178b523e10239d51c"
11SRC_URI[sha256sum] = "5e4a2492e6cc51345aa571b95283c43c2771c4f444837dbce2699d62f76b4adb"