summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2007-05-28 22:45:56 +0000
committerRichard Purdie <richard@openedhand.com>2007-05-28 22:45:56 +0000
commitce8bd8caeb2053ffa2b7fcceaad0fdf8a9b58804 (patch)
tree66a341c225d15578af26e50810067e07d70ce206
parent85e898cdfdc8b37e1c78efe3f673fb3f15b10446 (diff)
downloadpoky-ce8bd8caeb2053ffa2b7fcceaad0fdf8a9b58804.tar.gz
xrandr: Resolve symbol clash under uclibc
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1798 311d38ba-8fff-0310-9ca6-ca027cbcb966
-rw-r--r--meta/packages/xorg-app/xrandr/resolve_symbol_clash.patch35
-rw-r--r--meta/packages/xorg-app/xrandr_1.2.0.bb2
2 files changed, 37 insertions, 0 deletions
diff --git a/meta/packages/xorg-app/xrandr/resolve_symbol_clash.patch b/meta/packages/xorg-app/xrandr/resolve_symbol_clash.patch
new file mode 100644
index 0000000000..80d8960c94
--- /dev/null
+++ b/meta/packages/xorg-app/xrandr/resolve_symbol_clash.patch
@@ -0,0 +1,35 @@
1---
2 xrandr.c | 6 +++---
3 1 file changed, 3 insertions(+), 3 deletions(-)
4
5Index: xrandr-1.2.0/xrandr.c
6===================================================================
7--- xrandr-1.2.0.orig/xrandr.c 2007-02-19 05:26:50.000000000 +0000
8+++ xrandr-1.2.0/xrandr.c 2007-05-28 19:22:30.000000000 +0100
9@@ -163,7 +163,7 @@ reflection_name (Rotation rotation)
10
11 #if HAS_RANDR_1_2
12 typedef enum _policy {
13- clone, extend
14+ policy_clone, extend
15 } policy_t;
16
17 typedef enum _relation {
18@@ -1398,7 +1398,7 @@ main (int argc, char **argv)
19 #if HAS_RANDR_1_2
20 output_t *output = NULL;
21 char *crtc;
22- policy_t policy = clone;
23+ policy_t policy = policy_clone;
24 Bool setit_1_2 = False;
25 Bool query_1_2 = False;
26 Bool query_1 = False;
27@@ -1634,7 +1634,7 @@ main (int argc, char **argv)
28 continue;
29 }
30 if (!strcmp ("--clone", argv[i])) {
31- policy = clone;
32+ policy = policy_clone;
33 setit_1_2 = True;
34 continue;
35 }
diff --git a/meta/packages/xorg-app/xrandr_1.2.0.bb b/meta/packages/xorg-app/xrandr_1.2.0.bb
index 57bd51fd65..f876ba6b47 100644
--- a/meta/packages/xorg-app/xrandr_1.2.0.bb
+++ b/meta/packages/xorg-app/xrandr_1.2.0.bb
@@ -5,4 +5,6 @@ LICENSE= "BSD-X"
5 5
6DEPENDS += " libxrandr libxrender virtual/libx11" 6DEPENDS += " libxrandr libxrender virtual/libx11"
7PE = "1" 7PE = "1"
8PR = "r1"
8 9
10SRC_URI += "file://resolve_symbol_clash.patch;patch=1" \ No newline at end of file