From 161490f1050b4eafb88d173c62d5648c9b852970 Mon Sep 17 00:00:00 2001 From: Yu Ke Date: Tue, 16 Nov 2010 21:58:59 +0800 Subject: 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 --- .../xorg-app/xrandr/resolve_symbol_clash.patch | 33 ---------------------- meta/recipes-graphics/xorg-app/xrandr_1.3.2.bb | 10 ------- meta/recipes-graphics/xorg-app/xrandr_1.3.4.bb | 11 ++++++++ 3 files changed, 11 insertions(+), 43 deletions(-) delete mode 100644 meta/recipes-graphics/xorg-app/xrandr/resolve_symbol_clash.patch delete mode 100644 meta/recipes-graphics/xorg-app/xrandr_1.3.2.bb create mode 100644 meta/recipes-graphics/xorg-app/xrandr_1.3.4.bb (limited to 'meta/recipes-graphics/xorg-app') 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.2.bb deleted file mode 100644 index 3ddccb2496..0000000000 --- a/meta/recipes-graphics/xorg-app/xrandr_1.3.2.bb +++ /dev/null @@ -1,10 +0,0 @@ -require xorg-app-common.inc - -DESCRIPTION = "X Resize and Rotate extension command." -LICENSE= "BSD-X" -LIC_FILES_CHKSUM = "file://COPYING;md5=fe1608bdb33cf8c62a4438f7d34679b3" -DEPENDS += "libxrandr libxrender" -PE = "1" -PR = "r0" - -SRC_URI += "file://resolve_symbol_clash.patch" diff --git a/meta/recipes-graphics/xorg-app/xrandr_1.3.4.bb b/meta/recipes-graphics/xorg-app/xrandr_1.3.4.bb new file mode 100644 index 0000000000..9a6e4702b9 --- /dev/null +++ b/meta/recipes-graphics/xorg-app/xrandr_1.3.4.bb @@ -0,0 +1,11 @@ +require xorg-app-common.inc + +DESCRIPTION = "X Resize and Rotate extension command." +LICENSE= "BSD-X" +LIC_FILES_CHKSUM = "file://COPYING;md5=fe1608bdb33cf8c62a4438f7d34679b3" +DEPENDS += "libxrandr libxrender" +PE = "1" +PR = "r0" + +SRC_URI[md5sum] = "d6d20038257eba5178b523e10239d51c" +SRC_URI[sha256sum] = "5e4a2492e6cc51345aa571b95283c43c2771c4f444837dbce2699d62f76b4adb" -- cgit v1.2.3-54-g00ecf