diff options
| -rw-r--r-- | meta/conf/distro/include/preferred-xorg-versions.inc | 2 | ||||
| -rw-r--r-- | meta/recipes-graphics/xorg-app/xrandr/resolve_symbol_clash.patch | 33 | ||||
| -rw-r--r-- | meta/recipes-graphics/xorg-app/xrandr_1.3.4.bb (renamed from meta/recipes-graphics/xorg-app/xrandr_1.3.2.bb) | 3 |
3 files changed, 3 insertions, 35 deletions
diff --git a/meta/conf/distro/include/preferred-xorg-versions.inc b/meta/conf/distro/include/preferred-xorg-versions.inc index 90825cd384..5ef90363d9 100644 --- a/meta/conf/distro/include/preferred-xorg-versions.inc +++ b/meta/conf/distro/include/preferred-xorg-versions.inc @@ -126,7 +126,7 @@ PREFERRED_VERSION_xproto ?= "7.0.17" PREFERRED_VERSION_xproto-native ?= "7.0.17" PREFERRED_VERSION_xproto-nativesdk ?= "7.0.17" PREFERRED_VERSION_xproxymanagementprotocol ?= "1.0.3" -PREFERRED_VERSION_xrandr ?= "1.3.2" +PREFERRED_VERSION_xrandr ?= "1.3.4" PREFERRED_VERSION_xrdb ?= "1.0.5" PREFERRED_VERSION_xserver-kdrive ?= "1.7.99.2" PREFERRED_VERSION_xserver-xf86-dri-lite ?= "1.9.2" 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.4.bb index 3ddccb2496..9a6e4702b9 100644 --- a/meta/recipes-graphics/xorg-app/xrandr_1.3.2.bb +++ b/meta/recipes-graphics/xorg-app/xrandr_1.3.4.bb @@ -7,4 +7,5 @@ DEPENDS += "libxrandr libxrender" PE = "1" PR = "r0" -SRC_URI += "file://resolve_symbol_clash.patch" +SRC_URI[md5sum] = "d6d20038257eba5178b523e10239d51c" +SRC_URI[sha256sum] = "5e4a2492e6cc51345aa571b95283c43c2771c4f444837dbce2699d62f76b4adb" |