Hello community, here is the log from the commit of package gfxboot for openSUSE:Factory checked in at 2018-06-22 13:16:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gfxboot (Old) and /work/SRC/openSUSE:Factory/.gfxboot.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gfxboot" Fri Jun 22 13:16:20 2018 rev:145 rq:617723 version:4.5.46 Changes: -------- --- /work/SRC/openSUSE:Factory/gfxboot/gfxboot.changes 2018-05-01 23:15:12.278894664 +0200 +++ /work/SRC/openSUSE:Factory/.gfxboot.new/gfxboot.changes 2018-06-22 13:16:24.688750049 +0200 @@ -1,0 +2,16 @@ +Tue Jun 19 11:48:09 UTC 2018 - [email protected] + +- merge gh#openSUSE/gfxboot#34 +- rework video mode list composition (bsc#1096971) +- remove obsolete qemu options from gfxboot script +- 4.5.46 + +-------------------------------------------------------------------- +Tue Jun 12 07:36:14 UTC 2018 - [email protected] + +- merge gh#openSUSE/gfxboot#33 +- don't crash if vbe video mode list is empty (bsc#1096971) +- replace genisoimage with mkisofs +- 4.5.45 + +-------------------------------------------------------------------- Old: ---- gfxboot-4.5.44.tar.xz New: ---- gfxboot-4.5.46.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gfxboot.spec ++++++ --- /var/tmp/diff_new_pack.qGiG55/_old 2018-06-22 13:16:26.692675742 +0200 +++ /var/tmp/diff_new_pack.qGiG55/_new 2018-06-22 13:16:26.696675594 +0200 @@ -17,7 +17,7 @@ Name: gfxboot -Version: 4.5.44 +Version: 4.5.46 Release: 0 Summary: Graphical Boot Logo for GRUB, LILO and SYSLINUX License: GPL-2.0+ ++++++ KDE.tar.xz ++++++ ++++++ SLED.tar.xz ++++++ ++++++ SLES.tar.xz ++++++ ++++++ examples.tar.xz ++++++ ++++++ gfxboot-4.5.44.tar.xz -> gfxboot-4.5.46.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gfxboot-4.5.44/VERSION new/gfxboot-4.5.46/VERSION --- old/gfxboot-4.5.44/VERSION 2018-04-27 19:02:46.000000000 +0200 +++ new/gfxboot-4.5.46/VERSION 2018-06-19 13:48:09.000000000 +0200 @@ -1 +1 @@ -4.5.44 +4.5.46 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gfxboot-4.5.44/changelog new/gfxboot-4.5.46/changelog --- old/gfxboot-4.5.44/changelog 2018-04-27 19:02:46.000000000 +0200 +++ new/gfxboot-4.5.46/changelog 2018-06-19 13:48:09.000000000 +0200 @@ -1,3 +1,13 @@ +2018-06-19: 4.5.46 + - merge gh#openSUSE/gfxboot#34 + - rework video mode list composition (bsc#1096971) + - remove obsolete qemu options from gfxboot script + +2018-06-12: 4.5.45 + - merge gh#openSUSE/gfxboot#33 + - don't crash if vbe video mode list is empty (bsc#1096971) + - replace genisoimage with mkisofs + 2018-04-27: 4.5.44 - Translated using Weblate (Greek) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gfxboot-4.5.44/gfxboot new/gfxboot-4.5.46/gfxboot --- old/gfxboot-4.5.44/gfxboot 2018-04-27 19:02:46.000000000 +0200 +++ new/gfxboot-4.5.46/gfxboot 2018-06-19 13:48:09.000000000 +0200 @@ -1885,7 +1885,7 @@ symlink "i386", "$dst/boot/x86_64" if -d "$dst/boot/i386"; } - system "genisoimage" . ($opt_verbose ? "" : " --quiet") . + system "mkisofs" . ($opt_verbose ? "" : " --quiet") . " -o $img -f -r -no-emul-boot -boot-load-size 4 -boot-info-table" . " -b ${loader}isolinux.bin -hide boot.catalog $dst"; @@ -2128,8 +2128,6 @@ $q = "MALLOC_CHECK_=0 $q -enable-kvm" if -d "/sys/devices/system/kvm"; - $q .= " -display sdl -m 512"; - $q .= " -boot c" if $vm_env->{boot} eq 'hd'; $q .= " -boot d" if $vm_env->{boot} eq 'cd'; $q .= " -boot a" if $vm_env->{boot} eq 'fd'; ++++++ openSUSE.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/themes/openSUSE/src/dia_video.inc new/themes/openSUSE/src/dia_video.inc --- old/themes/openSUSE/src/dia_video.inc 2018-04-27 19:02:46.000000000 +0200 +++ new/themes/openSUSE/src/dia_video.inc 2018-06-19 13:48:09.000000000 +0200 @@ -15,6 +15,7 @@ /.vm_label 3 def /.vm_width 4 def /.vm_height 5 def +/.vm_bits 6 def % .vm_flags: % @@ -23,15 +24,34 @@ % % - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -% Create sort key for video modes. +% Compare two video modes. % -% ( vm_index -- sort_index ) +% ( vm_index_1 vm_index_2 -- bool ) % -/vmsortindex { - video.modes.list exch get - dup - .vm_width get 16 shl - exch .vm_height get add +% Returns true if vm_index_1 refers to a 'bigger' mode - that is: larger +% width, larger height, *less* color bits. +% +% Note that for color bits the sorting order is reversed (it's needed that +% way because we later keep only the first mode with a given resolution). +% +/vmcmp { + % first look up video mode arrays (see .vm_mode etc.) + video.modes.list exch get exch + video.modes.list exch get exch + + % compare elements + over .vm_width get over .vm_width get ne { + over .vm_width get over .vm_width get gt + } { + over .vm_height get over .vm_height get ne { + over .vm_height get over .vm_height get gt + } { + over .vm_bits get over .vm_bits get lt + } ifelse + } ifelse + + % clean up stack + exch pop exch pop } def @@ -51,6 +71,67 @@ % - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +% for dump_modes_* below +/tmp_mode 64 string def + + +% - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +% debug code (will be optimized out when unused) +% +% Print video mode list as we get it from Video BIOS. +% +% ( string -- ) +% +/dump_modes_initial { + 0 0 moveto + 0xf0f0f0 setcolor + 800 600 fillrect + 0xf00000 setcolor + "=== Press ESC to continue ===\n" show + 0x0000f0 setcolor + show + black setcolor + 0 1 videomodes { + videomodeinfo dup .undef eq { + pop pop pop pop + } { + 4 1 roll rot rot exch 4 -1 roll "0x%x: %d x %d @%d\n" tmp_mode sprintf + tmp_mode show + currentpoint exch pop 582 gt { currentpoint pop 270 add 36 moveto } if + } ifelse + } for + trace +} def + + +% - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +% debug code (will be optimized out when unused) +% +% ( string -- ) +% +% Print internal video mode list ('video.modes.list' variable). +% +/dump_modes { + 0 0 moveto + 0xf0f0f0 setcolor + 800 600 fillrect + 0xf00000 setcolor + "=== Press ESC to continue ===\n" show + 0x0000f0 setcolor + show + black setcolor + video.modes.list { + dup .vm_bits get over .vm_height get 2 index .vm_width get 3 index .vm_mode get + "0x%x: %d x %d @%d\n" tmp_mode sprintf + pop + tmp_mode show + currentpoint exch pop 582 gt { currentpoint pop 270 add 36 moveto } if + } forall + trace +} def + + +% - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - % Initialize video mode menu and its submenus. % % ( -- ) @@ -80,6 +161,8 @@ 1920 1200 ] def + % "-- initial --\n" dump_modes_initial + % Build list of VESA BIOS modes. % % Each mode is an array with .vm_* entries (see top of file). @@ -98,10 +181,10 @@ [ over 0xbfff and 6 2 roll 0x4000 and % fb support - exch vm_color_bits eq and % color bits - over 576 ge and % height >= 576 - 2 index 1024 ge and % width >= 1024 - { 1 "" "" 5 -2 roll ] } { pop pop pop pop } ifelse + over vm_color_bits ge and % color bits + 2 index 576 ge and % height >= 576 + 3 index 1024 ge and % width >= 1024 + { 1 "" "" 6 -3 roll ] } { pop pop pop pop pop } ifelse } ifelse } for @@ -120,18 +203,20 @@ [ exch 0 2 "" "" 5 -1 roll video.res over get exch video.res exch 1 add get + 0 ] } for } if - ] def + % "-- raw --\n" dump_modes + % sort video mode list (by display width, then height) video.modes.list length 3 gt { 0 1 video.modes.list length 2 sub { dup 1 add 1 video.modes.list length 1 sub { - over vmsortindex over vmsortindex gt { + over over vmcmp { over over vmsortexch } if pop @@ -140,6 +225,8 @@ } for } if + % "-- sorted --\n" dump_modes + % remove duplicates /video.modes.list @@ -153,8 +240,7 @@ } { over .vm_width get over .vm_width get eq 2 index .vm_height get 2 index .vm_height get eq and { - over .vm_mode get over .vm_mode get max 2 index .vm_mode rot put - over .vm_flags get over .vm_flags get or 2 index .vm_flags rot put + % same display resolution - remove from list free } if } ifelse @@ -163,6 +249,8 @@ video.modes.list free def + % "-- dups removed --\n" dump_modes + % create menu labels ("width x height") video.modes.list { @@ -176,15 +264,15 @@ % installer resolutions (set via 'xmode' option) /video.modes.installer [ - [ -1 0 "" /txt_kernel_default 0 0 ] + [ -1 0 "" /txt_kernel_default 0 0 0 ] video.modes.list { } forall ] def % kms text console resolutions (set via 'video' option) /video.modes.console [ - [ -1 0 "" /txt_kernel_default 0 0 ] - [ -2 0 "nomodeset" /txt_video_no_kms 0 0 ] + [ -1 0 "" /txt_kernel_default 0 0 0 ] + [ -2 0 "nomodeset" /txt_video_no_kms 0 0 0 ] video.modes.list { } forall ] def @@ -193,7 +281,7 @@ % % Not every mode is a VESA BIOS mode - see video.res comment above. /video.modes.bios [ - [ -1 0 "" /txt_kernel_default 0 0 ] + [ -1 0 "" /txt_kernel_default 0 0 0 ] video.modes.list { % keep only modes with VBE mode number @@ -226,7 +314,8 @@ xmenu.video.bios .xm_list [ video.modes.bios { .vm_label get } forall ] put xmenu.video.bios .xm_attr xmenu.video.bios .xm_list get length array put % line above 2nd entry - xmenu.video.bios .xm_attr get 1 1 put + % note: .xm_attr list might only have length 1 + xmenu.video.bios .xm_attr get dup length 1 gt { 1 1 put } { pop } ifelse xmenu.video.bios .xm_title "Video BIOS Size" put xmenu.video.bios .xm_current 0 put ++++++ upstream.tar.xz ++++++
