diff options
| author |   Yu Ke <ke.yu@intel.com> | 2010-11-16 21:58:59 +0800 |
|---|---|---|
| committer |   Richard Purdie <rpurdie@linux.intel.com> | 2010-11-22 10:25:34 +0000 |
| commit | 161490f1050b4eafb88d173c62d5648c9b852970 (patch) | |
| tree | ba2129d33443869772b0644f1b1060375257b9e4 /meta/recipes-graphics/xorg-app | |
| parent | 685cfa94a316cb822f4820ed170410e649cdd250 (diff) | |
| download | openembedded-core-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>
Diffstat (limited to 'meta/recipes-graphics/xorg-app')
| -rw-r--r-- | meta/recipes-graphics/xorg-app/xrandr/resolve_symbol_clash.patch | 33 | ||||
| -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 |
2 files changed, 2 insertions, 34 deletions
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 @@ ---- - 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 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" PE = "1" PR = "r0" -SRC_URI += "file://resolve_symbol_clash.patch" +SRC_URI[md5sum] = "d6d20038257eba5178b523e10239d51c" +SRC_URI[sha256sum] = "5e4a2492e6cc51345aa571b95283c43c2771c4f444837dbce2699d62f76b4adb" |