Update resolution and video template.

builder/iso/calcboot/isolinux/vga.cfg

@@ -12,28 +12,132 @@ LABEL auto
         APPEND isolinux.cfg calculate=,,,auto
 ENDTEXT
 
-
 LABEL 640x480
         MENU LABEL 640x480
         KERNEL calcmenu.c32
         APPEND isolinux.cfg calculate=,,,640x480
 
+LABEL 800x480
+        MENU LABEL 800x480
+        KERNEL calcmenu.c32
+        APPEND isolinux.cfg calculate=,,,800x480
+
 LABEL 800x600
         MENU LABEL 800x600
         KERNEL calcmenu.c32
         APPEND isolinux.cfg calculate=,,,800x600
 
+LABEL 1024x576
+        MENU LABEL 1024x576
+        KERNEL calcmenu.c32
+        APPEND isolinux.cfg calculate=,,,1024x576
+
+LABEL 1024x600
+        MENU LABEL 1024x600
+        KERNEL calcmenu.c32
+        APPEND isolinux.cfg calculate=,,,1024x600
+
 LABEL 1024x768
         MENU LABEL 1024x768
         KERNEL calcmenu.c32
         APPEND isolinux.cfg calculate=,,,1024x768
 
+LABEL 1200x800
+        MENU LABEL 1200x800
+        KERNEL calcmenu.c32
+        APPEND isolinux.cfg calculate=,,,1200x800
+
+LABEL 1280x720
+        MENU LABEL 1280x720
+        KERNEL calcmenu.c32
+        APPEND isolinux.cfg calculate=,,,1280x720
+
+LABEL 1280x768
+        MENU LABEL 1280x768
+        KERNEL calcmenu.c32
+        APPEND isolinux.cfg calculate=,,,1280x768
+
+LABEL 1280x800
+        MENU LABEL 1280x800
+        KERNEL calcmenu.c32
+        APPEND isolinux.cfg calculate=,,,1280x800
+
 LABEL 1280x1024
         MENU LABEL 1280x1024
         KERNEL calcmenu.c32
         APPEND isolinux.cfg calculate=,,,1280x1024
 
+LABEL 1360x768
+        MENU LABEL 1360x768
+        KERNEL calcmenu.c32
+        APPEND isolinux.cfg calculate=,,,1360x768
+
+LABEL 1366x768
+        MENU LABEL 1366x768
+        KERNEL calcmenu.c32
+        APPEND isolinux.cfg calculate=,,,1366x768
+
+LABEL 1368x768
+        MENU LABEL 1368x768
+        KERNEL calcmenu.c32
+        APPEND isolinux.cfg calculate=,,,1368x768
+
+LABEL 1400x1050
+        MENU LABEL 1400x1050
+        KERNEL calcmenu.c32
+        APPEND isolinux.cfg calculate=,,,1400x1050
+
+LABEL 1440x900
+        MENU LABEL 1440x900
+        KERNEL calcmenu.c32
+        APPEND isolinux.cfg calculate=,,,1440x900
+
+LABEL 1600x768
+        MENU LABEL 1600x768
+        KERNEL calcmenu.c32
+        APPEND isolinux.cfg calculate=,,,1600x768
+
+LABEL 1600x900
+        MENU LABEL 1600x900
+        KERNEL calcmenu.c32
+        APPEND isolinux.cfg calculate=,,,1600x900
+
 LABEL 1600x1200
         MENU LABEL 1600x1200
         KERNEL calcmenu.c32
         APPEND isolinux.cfg calculate=,,,1600x1200
+
+LABEL 1680x945
+        MENU LABEL 1680x945
+        KERNEL calcmenu.c32
+        APPEND isolinux.cfg calculate=,,,1680x945
+
+LABEL 1680x1050
+        MENU LABEL 1680x1050
+        KERNEL calcmenu.c32
+        APPEND isolinux.cfg calculate=,,,1680x1050
+
+LABEL 1920x1080
+        MENU LABEL 1920x1080
+        KERNEL calcmenu.c32
+        APPEND isolinux.cfg calculate=,,,1920x1080
+
+LABEL 1920x1200
+        MENU LABEL 1920x1200
+        KERNEL calcmenu.c32
+        APPEND isolinux.cfg calculate=,,,1920x1200
+
+LABEL 2048x1152
+        MENU LABEL 2048x1152
+        KERNEL calcmenu.c32
+        APPEND isolinux.cfg calculate=,,,2048x1152
+
+LABEL 2560x1440
+        MENU LABEL 2560x1440
+        KERNEL calcmenu.c32
+        APPEND isolinux.cfg calculate=,,,2560x1440
+
+LABEL 2560x1600
+        MENU LABEL 2560x1600
+        KERNEL calcmenu.c32
+        APPEND isolinux.cfg calculate=,,,2560x1600

builder/iso/calcboot/isolinux/video.cfg

@@ -9,44 +9,65 @@ MENUPARAM calculate 4
 LABEL auto
         MENU LABEL Auto
         KERNEL calcmenu.c32
-        APPEND vga.cfg calculate=,,,,auto
+        APPEND vga.cfg calculate=,,,,auto,nocomposite
 ENDTEXT
 
-LABEL vesa
-        MENU LABEL Generic VESA video driver (vesa)
+LABEL intel
+        MENU LABEL Intel (intel)
+        KERNEL calcmenu.c32
+        APPEND vga.cfg calculate=,,,,intel,nocomposite
+
+LABEL intel
+        MENU LABEL Intel with composite (intel)
         KERNEL calcmenu.c32
-        APPEND vga.cfg calculate=,,,,vesa
+        APPEND vga.cfg calculate=,,,,intel,composite
 
 LABEL radeon
-        MENU LABEL ATI Radeon video driver (radeon)
+        MENU LABEL ATI Radeon Open Source(radeon)
         KERNEL calcmenu.c32
-        APPEND vga.cfg calculate=,,,,radeon
+        APPEND vga.cfg calculate=,,,,radeon,nocomposite
 
 #?os_builder_linux_shortname!=CLS#
 LABEL fglrx
-        MENU LABEL Ati proprietary video driver (fglrx)
+        MENU LABEL Ati proprietary (fglrx)
         KERNEL calcmenu.c32
-        APPEND vga.cfg calculate=,,,,fglrx
+        APPEND vga.cfg calculate=,,,,fglrx,nocomposite
 
-#os_builder_linux_shortname#
-LABEL intel
-        MENU LABEL Intel video driver (intel)
+LABEL fglrx
+        MENU LABEL Ati proprietary with composite (fglrx)
         KERNEL calcmenu.c32
-        APPEND vga.cfg calculate=,,,,intel
+        APPEND vga.cfg calculate=,,,,fglrx,composite
 
+#os_builder_linux_shortname#
 LABEL nv
-        MENU LABEL Nvidia 2D only video driver (nv)
+        MENU LABEL Nvidia 2D only (nv)
         KERNEL calcmenu.c32
-        APPEND vga.cfg calculate=,,,,nv
+        APPEND vga.cfg calculate=,,,,nv,nocomposite
 
 LABEL nouveau
-        MENU LABEL Nvidia Open Source video driver (nouveau)
+        MENU LABEL Nvidia Open Source (nouveau)
         KERNEL calcmenu.c32
-        APPEND vga.cfg calculate=,,,,nouveau
+        APPEND vga.cfg calculate=,,,,nouveau,nocomposite
+
+LABEL nouveaucomp
+        MENU LABEL Nvidia Open Source with composite (nouveau)
+        KERNEL calcmenu.c32
+        APPEND vga.cfg calculate=,,,,nouveau,composite
 
 #?os_builder_linux_shortname!=CLS#
 LABEL nvidia
-        MENU LABEL NVIDIA Proprietary video driver (nvidia)
+        MENU LABEL NVIDIA Proprietary (nvidia)
         KERNEL calcmenu.c32
-        APPEND vga.cfg calculate=,,,,nvidia
+        APPEND vga.cfg calculate=,,,,nvidia,nocomposite
+
+LABEL nvidiacomp
+        MENU LABEL NVIDIA Proprietary with composite (nvidia)
+        KERNEL calcmenu.c32
+        APPEND vga.cfg calculate=,,,,nvidia,composite
 #os_builder_linux_shortname#
+
+LABEL vesa
+        MENU LABEL Generic VESA video driver (vesa)
+        KERNEL calcmenu.c32
+        APPEND vga.cfg calculate=,,,,vesa,nocomposite
+