proxmox-mirrors/grub2
1
0
Fork 0
mirror of https://git.proxmox.com/git/grub2 synced 2025-10-04 23:21:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge commit '8a245d5c1800627af4cefa99162a89c7a46d8842'

Browse Source 
Update grub-extras to fix build failure with GCC 9.
This commit is contained in:
Colin Watson 2019-11-08 08:09:57 +00:00
commit 777c8d2b97
11 changed files with 46 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
debian/grub-extras/915resolution/.bzrignore vendored
View File

@ -1,3 +0,0 @@
**/.deps-core
**/.dirstamp
Makefile.core.am

3
debian/grub-extras/915resolution/.gitignore vendored Normal file
View File

@ -0,0 +1,3 @@
.deps-core
.dirstamp
/Makefile.core.am

37
debian/grub-extras/915resolution/915resolution.c vendored
View File

@ -758,13 +758,23 @@ static void set_mode(vbios_map * map, cardinal mode, cardinal x, cardinal y, car
vbios_modeline_type2 * modeline = &res->modelines[j]; vbios_modeline_type2 * modeline = &res->modelines[j];
if (modeline->x1 == xprev && modeline->y1 == yprev) { if (modeline->x1 == xprev && modeline->y1 == yprev) {
unsigned long clock;
word hsyncstart, hsyncend, hblank;
word vsyncstart, vsyncend, vblank;
modeline->x1 = modeline->x2 = x-1; modeline->x1 = modeline->x2 = x-1;
modeline->y1 = modeline->y2 = y-1; modeline->y1 = modeline->y2 = y-1;
gtf_timings(x, y, freqs[j], &modeline->clock, gtf_timings(x, y, freqs[j], &clock,
&modeline->hsyncstart, &modeline->hsyncend, &hsyncstart, &hsyncend, &hblank,
&modeline->hblank, &modeline->vsyncstart, &vsyncstart, &vsyncend, &vblank);
&modeline->vsyncend, &modeline->vblank); modeline->clock = clock;
modeline->hsyncstart = hsyncstart;
modeline->hsyncend = hsyncend;
modeline->hblank = hblank;
modeline->vsyncstart = vsyncstart;
modeline->vsyncend = vsyncend;
modeline->vblank = vblank;
if (htotal) if (htotal)
modeline->htotal = htotal; modeline->htotal = htotal;
@ -790,13 +800,24 @@ static void set_mode(vbios_map * map, cardinal mode, cardinal x, cardinal y, car
vbios_modeline_type3 * modeline = &res->modelines[j]; vbios_modeline_type3 * modeline = &res->modelines[j];
if (modeline->x1 == xprev && modeline->y1 == yprev) { if (modeline->x1 == xprev && modeline->y1 == yprev) {
unsigned long clock;
word hsyncstart, hsyncend, hblank;
word vsyncstart, vsyncend, vblank;
modeline->x1 = modeline->x2 = x-1; modeline->x1 = modeline->x2 = x-1;
modeline->y1 = modeline->y2 = y-1; modeline->y1 = modeline->y2 = y-1;
gtf_timings(x, y, freqs[j], &modeline->clock, gtf_timings(x, y, freqs[j], &clock,
&modeline->hsyncstart, &modeline->hsyncend, &hsyncstart, &hsyncend, &hblank,
&modeline->hblank, &modeline->vsyncstart, &vsyncstart, &vsyncend, &vblank);
&modeline->vsyncend, &modeline->vblank); modeline->clock = clock;
modeline->hsyncstart = hsyncstart;
modeline->hsyncend = hsyncend;
modeline->hblank = hblank;
modeline->vsyncstart = vsyncstart;
modeline->vsyncend = vsyncend;
modeline->vblank = vblank;
if (htotal) if (htotal)
modeline->htotal = htotal; modeline->htotal = htotal;
else else

3
debian/grub-extras/disabled/gpxe/.bzrignore vendored
View File

@ -1,3 +0,0 @@
**/.deps-core
**/.dirstamp
Makefile.core.am

3
debian/grub-extras/disabled/gpxe/.gitignore vendored Normal file
View File

@ -0,0 +1,3 @@
.deps-core
.dirstamp
/Makefile.core.am

5
debian/grub-extras/disabled/zfs/.bzrignore vendored
View File

@ -1,5 +0,0 @@
**/.deps-core
**/.deps-util
**/.dirstamp
Makefile.core.am
Makefile.util.am

5
debian/grub-extras/disabled/zfs/.gitignore vendored Normal file
View File

@ -0,0 +1,5 @@
.deps-core
.deps-util
.dirstamp
/Makefile.core.am
/Makefile.util.am

3
debian/grub-extras/lua/.bzrignore vendored
View File

@ -1,3 +0,0 @@
**/.deps-core
**/.dirstamp
Makefile.core.am

3
debian/grub-extras/lua/.gitignore vendored Normal file
View File

@ -0,0 +1,3 @@
.deps-core
.dirstamp
/Makefile.core.am

3
debian/grub-extras/ntldr-img/.bzrignore vendored
View File

@ -1,3 +0,0 @@
**/.deps-core
**/.dirstamp
Makefile.core.am

3
debian/grub-extras/ntldr-img/.gitignore vendored Normal file
View File

@ -0,0 +1,3 @@
.deps-core
.dirstamp
/Makefile.core.am