diff options
| author | Max Krummenacher <max.krummenacher@toradex.com> | 2020-02-02 13:35:31 +0100 |
|---|---|---|
| committer | Max Krummenacher <max.krummenacher@toradex.com> | 2020-02-02 14:00:52 +0100 |
| commit | 54ddc54cc3e35c49a7f544143ba36356bab9c8d8 (patch) | |
| tree | d4a3b3657771150247c495ae50df84773ff7648f | |
| parent | ebd636723920a599328c2cf0021f6badb868eebc (diff) | |
lxrandr: update to 0.3.2
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
| -rw-r--r-- | recipes-lxde/lxrandr/lxrandr/0001-lxrandr.c-improve-xrandr-output-parser-to-cope-with-.patch | 16 | ||||
| -rw-r--r-- | recipes-lxde/lxrandr/lxrandr_0.3.2.bb (renamed from recipes-lxde/lxrandr/lxrandr_0.3.1.bb) | 4 |
2 files changed, 10 insertions, 10 deletions
diff --git a/recipes-lxde/lxrandr/lxrandr/0001-lxrandr.c-improve-xrandr-output-parser-to-cope-with-.patch b/recipes-lxde/lxrandr/lxrandr/0001-lxrandr.c-improve-xrandr-output-parser-to-cope-with-.patch index 04f34a2..2f4e3d4 100644 --- a/recipes-lxde/lxrandr/lxrandr/0001-lxrandr.c-improve-xrandr-output-parser-to-cope-with-.patch +++ b/recipes-lxde/lxrandr/lxrandr/0001-lxrandr.c-improve-xrandr-output-parser-to-cope-with-.patch @@ -1,4 +1,4 @@ -From 81c49c9cb5180894fee6adab99d4d2e982d2a293 Mon Sep 17 00:00:00 2001 +From 184a6e9dad1adc67d6d3d8e4682e987aee644194 Mon Sep 17 00:00:00 2001 From: Max Krummenacher <max.krummenacher@toradex.com> Date: Sat, 25 Mar 2017 17:51:53 +0100 Subject: [PATCH] lxrandr.c: improve xrandr output parser to cope with i.mx 6 @@ -31,21 +31,21 @@ Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/lxrandr.c b/src/lxrandr.c -index 33e02b2..b8c266d 100644 +index 0d46e9c..c40d446 100644 --- a/src/lxrandr.c +++ b/src/lxrandr.c @@ -118,8 +118,8 @@ static gboolean get_xrandr_info() return FALSE; } -- regex = g_regex_new( "\n([-a-zA-Z]+[-0-9]*) +connected ([^(\n ]*)[^\n]*" +- regex = g_regex_new( "\n([-\\.a-zA-Z]+[-\\.0-9]*) +connected ([^(\n ]*)[^\n]*" - "((\n +[0-9]+x[0-9]+[^\n]+)+)", -+ regex = g_regex_new( "\n([ -a-zA-Z0-9]+[-0-9]*) +connected [ a-zA-Z]*([^(\n ]*)[^\n]*" ++ regex = g_regex_new( "\n([ -\\.a-zA-Z0-9]+[-\\.0-9]*) +connected [ a-zA-Z]*([^(\n ]*)[^\n]*" + "((\n +[SUV:]*[0-9]+x[0-9]+.*[^\n]+)+)", 0, 0, NULL ); if( g_regex_match( regex, output, 0, &match ) ) { -@@ -343,8 +343,9 @@ static GString* get_command_xrandr_info() +@@ -349,8 +349,9 @@ static GString* get_command_xrandr_info() for( l = monitors; l; l = l->next ) { Monitor* m = (Monitor*)l->data; @@ -56,7 +56,7 @@ index 33e02b2..b8c266d 100644 // if the monitor is turned on if (m->try_mode >= 0) -@@ -403,7 +404,9 @@ static GString* get_command_xrandr_info() +@@ -409,7 +410,9 @@ static GString* get_command_xrandr_info() case PLACEMENT_DEFAULT: g_string_append(cmd, " --same-as "); } @@ -66,7 +66,7 @@ index 33e02b2..b8c266d 100644 } else if (l != monitors) { -@@ -426,7 +429,9 @@ static GString* get_command_xrandr_info() +@@ -432,7 +435,9 @@ static GString* get_command_xrandr_info() case PLACEMENT_DEFAULT: g_string_append(cmd, " --same-as "); } @@ -77,5 +77,5 @@ index 33e02b2..b8c266d 100644 /* g_string_append( cmd, "" ); */ -- -2.6.6 +2.20.1 diff --git a/recipes-lxde/lxrandr/lxrandr_0.3.1.bb b/recipes-lxde/lxrandr/lxrandr_0.3.2.bb index d1ec999..9c2aa63 100644 --- a/recipes-lxde/lxrandr/lxrandr_0.3.1.bb +++ b/recipes-lxde/lxrandr/lxrandr_0.3.2.bb @@ -12,8 +12,8 @@ SRC_URI = " \ file://0001-lxrandr.c-improve-xrandr-output-parser-to-cope-with-.patch \ " -SRC_URI[md5sum] = "b327938f18a4baac85c4707f927d606e" -SRC_URI[sha256sum] = "6d98338485a90d9e47f6d08184df77ca0d9715517f8a45a914e861750589184e" +SRC_URI[md5sum] = "5101ab29d87fb2b56a5ec5bc8bc3f258" +SRC_URI[sha256sum] = "8b5edfc9718061bc161fe51d388697cbaa819d6f8013ed24ba22f438e0dbc312" PACKAGECONFIG ?= "gtk3" PACKAGECONFIG[gtk3] = "--enable-gtk3,,gtk+3" |