[oe-commits] org.oe.dev xrandr: fix uclibc build (from Poky)

[hrw commit]

xrandr: fix uclibc build (from Poky)

Author: hrw at openembedded.org
Branch: org.openembedded.dev
Revision: 917b0d8264255bcc05a47f9b2b7167bf8781ef46
ViewMTN: http://monotone.openembedded.org/revision.psp?id=917b0d8264255bcc05a47f9b2b7167bf8781ef46
Files:
1
packages/xorg-app/xrandr
packages/xorg-app/xrandr/resolve_symbol_clash.patch
packages/xorg-app/xrandr_1.2.0.bb
Diffs:

#
# mt diff -r8a4d576b3d74319becbab6ba2aeec2ef416536be -r917b0d8264255bcc05a47f9b2b7167bf8781ef46
#
# 
# 
# add_dir "packages/xorg-app/xrandr"
# 
# add_file "packages/xorg-app/xrandr/resolve_symbol_clash.patch"
#  content [e04093ccff1de56da6f47bf7a01121af266f5765]
# 
# patch "packages/xorg-app/xrandr_1.2.0.bb"
#  from [7a399a320bc306de2bf9f466131ee9d944743aee]
#    to [ee85b371d620be9dba06122f7122eb39a90a578d]
# 
============================================================
--- packages/xorg-app/xrandr/resolve_symbol_clash.patch	e04093ccff1de56da6f47bf7a01121af266f5765
+++ packages/xorg-app/xrandr/resolve_symbol_clash.patch	e04093ccff1de56da6f47bf7a01121af266f5765
@@ -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;
+ 	}
============================================================
--- packages/xorg-app/xrandr_1.2.0.bb	7a399a320bc306de2bf9f466131ee9d944743aee
+++ packages/xorg-app/xrandr_1.2.0.bb	ee85b371d620be9dba06122f7122eb39a90a578d
@@ -5,4 +5,6 @@ PE = "1"
 
 DEPENDS += " libxrandr libxrender virtual/libx11"
 PE = "1"
+PR = "r1"
 
+SRC_URI += "file://resolve_symbol_clash.patch;patch=1"