summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--meta/packages/xorg-app/xrandr/resolve_symbol_clash.patch16
-rw-r--r--meta/packages/xorg-app/xrandr_1.2.2.bb (renamed from meta/packages/xorg-app/xrandr_1.2.0.bb)1
2 files changed, 7 insertions, 10 deletions
diff --git a/meta/packages/xorg-app/xrandr/resolve_symbol_clash.patch b/meta/packages/xorg-app/xrandr/resolve_symbol_clash.patch
index 80d8960c9..1ecf9563f 100644
--- a/meta/packages/xorg-app/xrandr/resolve_symbol_clash.patch
+++ b/meta/packages/xorg-app/xrandr/resolve_symbol_clash.patch
@@ -2,11 +2,9 @@
xrandr.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
-Index: xrandr-1.2.0/xrandr.c
-===================================================================
---- xrandr-1.2.0.orig/xrandr.c 2007-02-19 05:26:50.000000000 +0000
-+++ xrandr-1.2.0/xrandr.c 2007-05-28 19:22:30.000000000 +0100
-@@ -163,7 +163,7 @@ reflection_name (Rotation rotation)
+--- 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 {
@@ -15,16 +13,16 @@ Index: xrandr-1.2.0/xrandr.c
} policy_t;
typedef enum _relation {
-@@ -1398,7 +1398,7 @@ main (int argc, char **argv)
+@@ -1602,7 +1602,7 @@
+ int ret = 0;
#if HAS_RANDR_1_2
output_t *output = NULL;
- char *crtc;
- policy_t policy = clone;
+ policy_t policy = policy_clone;
Bool setit_1_2 = False;
Bool query_1_2 = False;
- Bool query_1 = False;
-@@ -1634,7 +1634,7 @@ main (int argc, char **argv)
+ Bool modeit = False;
+@@ -1863,7 +1863,7 @@
continue;
}
if (!strcmp ("--clone", argv[i])) {
diff --git a/meta/packages/xorg-app/xrandr_1.2.0.bb b/meta/packages/xorg-app/xrandr_1.2.2.bb
index efeea388d..05ef6af95 100644
--- a/meta/packages/xorg-app/xrandr_1.2.0.bb
+++ b/meta/packages/xorg-app/xrandr_1.2.2.bb
@@ -3,7 +3,6 @@ require xorg-app-common.inc
DESCRIPTION = "X Resize and Rotate extension command."
LICENSE= "BSD-X"
DEPENDS += "libxrandr libxrender"
-PR = "r1"
PE = "1"
SRC_URI += "file://resolve_symbol_clash.patch;patch=1"