diff options
| author | Richard Purdie <richard@openedhand.com> | 2007-05-28 22:45:56 +0000 |
|---|---|---|
| committer | Richard Purdie <richard@openedhand.com> | 2007-05-28 22:45:56 +0000 |
| commit | ce8bd8caeb2053ffa2b7fcceaad0fdf8a9b58804 (patch) | |
| tree | 66a341c225d15578af26e50810067e07d70ce206 | |
| parent | 85e898cdfdc8b37e1c78efe3f673fb3f15b10446 (diff) | |
| download | openembedded-core-ce8bd8caeb2053ffa2b7fcceaad0fdf8a9b58804.tar.gz openembedded-core-ce8bd8caeb2053ffa2b7fcceaad0fdf8a9b58804.tar.bz2 openembedded-core-ce8bd8caeb2053ffa2b7fcceaad0fdf8a9b58804.tar.xz openembedded-core-ce8bd8caeb2053ffa2b7fcceaad0fdf8a9b58804.zip | |
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.patch | 35 | ||||
| -rw-r--r-- | meta/packages/xorg-app/xrandr_1.2.0.bb | 2 |
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 000000000..80d8960c9 --- /dev/null +++ b/meta/packages/xorg-app/xrandr/resolve_symbol_clash.patch @@ -0,0 +1,35 @@ +--- + 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) + + #if HAS_RANDR_1_2 + typedef enum _policy { +- clone, extend ++ policy_clone, extend + } policy_t; + + typedef enum _relation { +@@ -1398,7 +1398,7 @@ main (int argc, char **argv) + #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) + continue; + } + if (!strcmp ("--clone", argv[i])) { +- policy = clone; ++ policy = policy_clone; + setit_1_2 = True; + continue; + } diff --git a/meta/packages/xorg-app/xrandr_1.2.0.bb b/meta/packages/xorg-app/xrandr_1.2.0.bb index 57bd51fd6..f876ba6b4 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" DEPENDS += " libxrandr libxrender virtual/libx11" PE = "1" +PR = "r1" +SRC_URI += "file://resolve_symbol_clash.patch;patch=1"
\ No newline at end of file |