summaryrefslogtreecommitdiffstats
path: root/patches
diff options
context:
space:
mode:
authorBjörn Esser <b.esser@pengutronix.de>2019-09-25 11:13:56 +0200
committerMichael Olbrich <m.olbrich@pengutronix.de>2019-10-01 21:35:26 +0200
commit0a8e35d3390c954396a73ce10fa8028bd3f06087 (patch)
tree66606d4206828118bd77804386db8b82b46983b1 /patches
parent97f7df7601a04d56c659df91475d84a57004dc83 (diff)
downloadptxdist-0a8e35d3390c954396a73ce10fa8028bd3f06087.tar.gz
ptxdist-0a8e35d3390c954396a73ce10fa8028bd3f06087.tar.xz
xorg-driver-video-fbdev: version bump 0.4.4 -> 0.5.0
Signed-off-by: Björn Esser <b.esser@pengutronix.de> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'patches')
-rw-r--r--patches/xf86-video-fbdev-0.5.0/0001-xf86-video-fbdev-add-option-to-leave-timings-alone.patch (renamed from patches/xf86-video-fbdev-0.4.4/0001-xf86-video-fbdev-add-option-to-leave-timings-alone.patch)8
-rw-r--r--patches/xf86-video-fbdev-0.5.0/series (renamed from patches/xf86-video-fbdev-0.4.4/series)0
2 files changed, 4 insertions, 4 deletions
diff --git a/patches/xf86-video-fbdev-0.4.4/0001-xf86-video-fbdev-add-option-to-leave-timings-alone.patch b/patches/xf86-video-fbdev-0.5.0/0001-xf86-video-fbdev-add-option-to-leave-timings-alone.patch
index 64ace0375..58e97918f 100644
--- a/patches/xf86-video-fbdev-0.4.4/0001-xf86-video-fbdev-add-option-to-leave-timings-alone.patch
+++ b/patches/xf86-video-fbdev-0.5.0/0001-xf86-video-fbdev-add-option-to-leave-timings-alone.patch
@@ -11,10 +11,10 @@ Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/fbdev.c b/src/fbdev.c
-index f5a7378..20078bc 100644
+index f25ef72204f0..35a3c60f7835 100644
--- a/src/fbdev.c
+++ b/src/fbdev.c
-@@ -124,6 +124,7 @@ typedef enum {
+@@ -125,6 +125,7 @@ typedef enum {
OPTION_SHADOW_FB,
OPTION_ROTATE,
OPTION_FBDEV,
@@ -22,7 +22,7 @@ index f5a7378..20078bc 100644
OPTION_DEBUG
} FBDevOpts;
-@@ -131,6 +132,7 @@ static const OptionInfoRec FBDevOptions[] = {
+@@ -132,6 +133,7 @@ static const OptionInfoRec FBDevOptions[] = {
{ OPTION_SHADOW_FB, "ShadowFB", OPTV_BOOLEAN, {0}, FALSE },
{ OPTION_ROTATE, "Rotate", OPTV_STRING, {0}, FALSE },
{ OPTION_FBDEV, "fbdev", OPTV_STRING, {0}, FALSE },
@@ -30,7 +30,7 @@ index f5a7378..20078bc 100644
{ OPTION_DEBUG, "debug", OPTV_BOOLEAN, {0}, FALSE },
{ -1, NULL, OPTV_NONE, {0}, FALSE }
};
-@@ -518,9 +520,11 @@ FBDevPreInit(ScrnInfoPtr pScrn, int flags)
+@@ -589,9 +591,11 @@ FBDevPreInit(ScrnInfoPtr pScrn, int flags)
}
/* select video modes */
diff --git a/patches/xf86-video-fbdev-0.4.4/series b/patches/xf86-video-fbdev-0.5.0/series
index 216d5fa42..216d5fa42 100644
--- a/patches/xf86-video-fbdev-0.4.4/series
+++ b/patches/xf86-video-fbdev-0.5.0/series