diff -u tvtime-1.0.2/debian/changelog tvtime-1.0.2/debian/changelog --- tvtime-1.0.2/debian/changelog +++ tvtime-1.0.2/debian/changelog @@ -1,3 +1,13 @@ +tvtime (1.0.2-14ubuntu3) vivid; urgency=medium + + * Improve error message about invalid framesize: + - The "Frame too short" error message is not quite right. The problem is + that tvtime expects exactly the same height as available on a TV standard, + e.g. 480 or 576. Any different value (even bigger) won't work. + - Renamed tvtime-1.0.2-videoinput.patch to tvtime-1.0.2-uvc.patch + + -- POJAR GEORGE Thu, 12 Mar 2015 17:37:24 +0000 + tvtime (1.0.2-14ubuntu2) vivid; urgency=medium * Updated debian/patches/tvtime-1.0.2-alsamixer.patch: diff -u tvtime-1.0.2/debian/patches/series tvtime-1.0.2/debian/patches/series --- tvtime-1.0.2/debian/patches/series +++ tvtime-1.0.2/debian/patches/series @@ -6,7 +6,7 @@ pal_audio_mode_persistence.patch fullscreen.diff tvtime-1.0.2-screensaver.patch -tvtime-1.0.2-videoinput.patch +tvtime-1.0.2-uvc.patch tvtime-1.0.2-osd.patch tvtime-1.0.2-usage.patch typo.diff diff -u tvtime-1.0.2/debian/patches/tvtime-1.0.2-channel_list.patch tvtime-1.0.2/debian/patches/tvtime-1.0.2-channel_list.patch --- tvtime-1.0.2/debian/patches/tvtime-1.0.2-channel_list.patch +++ tvtime-1.0.2/debian/patches/tvtime-1.0.2-channel_list.patch @@ -4,8 +4,8 @@ Author: Pojar George Index: tvtime-1.0.2/docs/html/default.tvtime.xml =================================================================== ---- tvtime-1.0.2.orig/docs/html/default.tvtime.xml 2014-06-11 09:20:25.628028482 +0000 -+++ tvtime-1.0.2/docs/html/default.tvtime.xml 2014-06-11 09:20:25.620028483 +0000 +--- tvtime-1.0.2.orig/docs/html/default.tvtime.xml ++++ tvtime-1.0.2/docs/html/default.tvtime.xml @@ -379,41 +379,41 @@ CHANNEL_DOWN SET_INPUT CHANNEL_INC SET_INPUT_WIDTH @@ -96,9 +96,9 @@ --> Index: tvtime-1.0.2/src/tvtimeconf.c =================================================================== ---- tvtime-1.0.2.orig/src/tvtimeconf.c 2014-06-11 09:20:25.628028482 +0000 -+++ tvtime-1.0.2/src/tvtimeconf.c 2014-06-11 09:20:25.620028483 +0000 -@@ -877,6 +877,7 @@ +--- tvtime-1.0.2.orig/src/tvtimeconf.c ++++ tvtime-1.0.2/src/tvtimeconf.c +@@ -877,6 +877,7 @@ config_t *config_new( void ) ct->keymap[ I_F7 ] = TVTIME_PICTURE_UP; ct->keymap[ 'd' ] = TVTIME_SHOW_STATS; ct->keymap[ 'g' ] = TVTIME_SHOW_EPG; @@ -108,9 +108,9 @@ ct->keymap[ 'i' ] = TVTIME_TOGGLE_INPUT; Index: tvtime-1.0.2/src/utils.c =================================================================== ---- tvtime-1.0.2.orig/src/utils.c 2014-06-11 09:20:25.628028482 +0000 -+++ tvtime-1.0.2/src/utils.c 2014-06-11 09:20:25.620028483 +0000 -@@ -443,6 +443,7 @@ +--- tvtime-1.0.2.orig/src/utils.c ++++ tvtime-1.0.2/src/utils.c +@@ -443,6 +443,7 @@ static command_names_t command_table[] = { "CHANNEL_DOWN", TVTIME_CHANNEL_DEC }, { "CHANNEL_INC", TVTIME_CHANNEL_INC }, { "CHANNEL_JUMP", TVTIME_CHANNEL_PREV }, @@ -118,7 +118,7 @@ { "CHANNEL_PREV", TVTIME_CHANNEL_PREV }, { "CHANNEL_RENUMBER", TVTIME_CHANNEL_RENUMBER }, { "CHANNEL_SAVE_TUNING", TVTIME_CHANNEL_SAVE_TUNING }, -@@ -804,3 +805,10 @@ +@@ -804,3 +805,10 @@ int lfprintf( FILE *stream, const char * return ret; } @@ -131,9 +131,9 @@ +} Index: tvtime-1.0.2/src/utils.h =================================================================== ---- tvtime-1.0.2.orig/src/utils.h 2014-06-11 09:20:25.628028482 +0000 -+++ tvtime-1.0.2/src/utils.h 2014-06-11 09:20:25.620028483 +0000 -@@ -233,6 +233,8 @@ +--- tvtime-1.0.2.orig/src/utils.h ++++ tvtime-1.0.2/src/utils.h +@@ -233,6 +233,8 @@ enum tvtime_commands TVTIME_MENU_EXIT, TVTIME_SHOW_MENU, @@ -142,7 +142,7 @@ /* This is a 'menu-mode' command, but kinda not. */ TVTIME_MOUSE_MOVE }; -@@ -262,6 +264,8 @@ +@@ -262,6 +264,8 @@ int lfputs( const char *s, FILE *stream int lprintf( const char *format, ... ); int lfprintf( FILE *stream, const char *format, ... ); @@ -153,9 +153,9 @@ #endif Index: tvtime-1.0.2/docs/html/usage.html =================================================================== ---- tvtime-1.0.2.orig/docs/html/usage.html 2014-06-11 09:20:25.628028482 +0000 -+++ tvtime-1.0.2/docs/html/usage.html 2014-06-11 09:20:25.620028483 +0000 -@@ -283,6 +283,7 @@ +--- tvtime-1.0.2.orig/docs/html/usage.html ++++ tvtime-1.0.2/docs/html/usage.html +@@ -283,6 +283,7 @@ included with the tvtime distribution.Escape or q Quit F1 or Tab Show menu @@ -163,7 +163,7 @@ up/down Change channels 0-9 and Enter Change channels Backspace Jump to previous channel -@@ -468,6 +469,13 @@ +@@ -468,6 +469,13 @@ Changes to the last channel you were at. forth between two programs on distant channels.

@@ -179,8 +179,8 @@

Index: tvtime-1.0.2/src/tvtimeosd.c =================================================================== ---- tvtime-1.0.2.orig/src/tvtimeosd.c 2014-06-11 09:20:25.628028482 +0000 -+++ tvtime-1.0.2/src/tvtimeosd.c 2014-06-11 09:20:25.620028483 +0000 +--- tvtime-1.0.2.orig/src/tvtimeosd.c ++++ tvtime-1.0.2/src/tvtimeosd.c @@ -34,6 +34,8 @@ #include "tvtimeosd.h" #include "pulldown.h" @@ -190,7 +190,7 @@ typedef struct string_object_s { osd_string_t *string; -@@ -116,6 +118,9 @@ +@@ -116,6 +118,9 @@ struct tvtime_osd_s char hold_message[ 255 ]; char hold_message2[ 255 ]; @@ -200,7 +200,7 @@ int film_mode; int info_available; int pulldown_mode; -@@ -859,6 +864,24 @@ +@@ -859,6 +864,24 @@ void tvtime_osd_list_set_text( tvtime_os osd_list_set_text( osd->list, line, text ); } @@ -227,9 +227,9 @@ osd_list_set_lines( osd->list, numlines ); Index: tvtime-1.0.2/src/tvtimeosd.h =================================================================== ---- tvtime-1.0.2.orig/src/tvtimeosd.h 2014-06-11 09:20:25.628028482 +0000 -+++ tvtime-1.0.2/src/tvtimeosd.h 2014-06-11 09:20:25.620028483 +0000 -@@ -92,6 +92,10 @@ +--- tvtime-1.0.2.orig/src/tvtimeosd.h ++++ tvtime-1.0.2/src/tvtimeosd.h +@@ -92,6 +92,10 @@ int tvtime_osd_list_get_numlines( tvtime int tvtime_osd_list_get_line_pos( tvtime_osd_t *osd, int y ); void tvtime_osd_list_set_hilight( tvtime_osd_t *osd, int pos ); void tvtime_osd_list_set_text( tvtime_osd_t *osd, int line, const char *text ); @@ -242,8 +242,8 @@ int *width, int *height ); Index: tvtime-1.0.2/src/commands.c =================================================================== ---- tvtime-1.0.2.orig/src/commands.c 2014-06-11 09:20:25.628028482 +0000 -+++ tvtime-1.0.2/src/commands.c 2014-06-11 09:20:25.624028482 +0000 +--- tvtime-1.0.2.orig/src/commands.c ++++ tvtime-1.0.2/src/commands.c @@ -42,6 +42,7 @@ #include "epg.h" @@ -252,7 +252,7 @@ #define MAX_USER_MENUS 64 /* Maximum number of steps to increment sleeptimer. */ -@@ -51,6 +52,7 @@ +@@ -51,6 +52,7 @@ enum menu_type { MENU_REDIRECT, MENU_FAVORITES, @@ -260,7 +260,7 @@ MENU_USER }; -@@ -65,6 +67,7 @@ +@@ -65,6 +67,7 @@ static menu_names_t menu_table[] = { { "picture", MENU_REDIRECT, "picture-tuner" }, { "input", MENU_REDIRECT, "input-ntsc" }, { "favorites", MENU_FAVORITES, 0 }, @@ -268,7 +268,7 @@ }; static int tvtime_num_builtin_menus( void ) -@@ -169,6 +172,9 @@ +@@ -169,6 +172,9 @@ struct commands_s { int numfavorites; int favorites[ NUM_FAVORITES ]; @@ -278,7 +278,7 @@ int epg; int epg_nowandnext; // We are showing page [epg_nowandnext] of the epg int epg_channel; -@@ -1145,12 +1151,16 @@ +@@ -1145,12 +1151,16 @@ commands_t *commands_new( config_t *cfg, cmd->numfavorites = 0; memset( cmd->favorites, 0, sizeof( cmd->favorites ) ); @@ -295,7 +295,7 @@ cmd->curmenupos = 0; cmd->curmenusize = 0; cmd->curusermenu = 0; -@@ -1865,6 +1875,9 @@ +@@ -1865,6 +1875,9 @@ static void menu_off( commands_t *cmd ) tvtime_osd_list_hold( cmd->osd, 0 ); tvtime_osd_show_list( cmd->osd, 0, 0 ); cmd->menuactive = 0; @@ -305,7 +305,7 @@ } static void menu_enter( commands_t *cmd ) -@@ -1879,6 +1892,15 @@ +@@ -1879,6 +1892,15 @@ static void menu_enter( commands_t *cmd } } menu_off( cmd ); @@ -321,7 +321,7 @@ } else if( cmd->curmenu == MENU_USER ) { int command = menu_get_enter_command( cmd->curusermenu, cmd->curmenupos + 1 ); const char *argument = menu_get_enter_argument( cmd->curusermenu, cmd->curmenupos + 1 ); -@@ -1892,7 +1914,7 @@ +@@ -1892,7 +1914,7 @@ static void menu_enter( commands_t *cmd static void menu_back( commands_t *cmd ) { @@ -330,7 +330,7 @@ commands_handle( cmd, TVTIME_SHOW_MENU, "stations" ); } else if( cmd->curmenu == MENU_USER ) { int command = menu_get_back_command( cmd->curusermenu ); -@@ -1915,7 +1937,8 @@ +@@ -1915,7 +1937,8 @@ static void display_current_menu( comman tvtime_osd_list_set_text( cmd->osd, 0, _("Favorites") ); for( i = 0; i < cmd->numfavorites; i++ ) { char text[ 32 ]; @@ -340,7 +340,7 @@ tvtime_osd_list_set_text( cmd->osd, i + 1, text ); } snprintf( string, sizeof( string ), TVTIME_ICON_PLUSBUTTON " %s", -@@ -1937,6 +1960,39 @@ +@@ -1937,6 +1960,39 @@ static void display_current_menu( comman tvtime_osd_list_hold( cmd->osd, 1 ); } @@ -350,7 +350,7 @@ + int i; + + tvtime_osd_list_set_lines( cmd->osd, MAX_STATIONS + 1 ); -+ tvtime_osd_list_set_text( cmd->osd, 0, _("Channel list \0") ); ++ tvtime_osd_list_set_text( cmd->osd, 0, _("Channel list \0") ); + + for( i = 0; i < MAX_STATIONS; i++ ) { + const char *pos = station_get_channel( cmd->stationmgr, i + channel - 1 ); @@ -380,7 +380,7 @@ menu_t *commands_get_menu( commands_t *cmd, const char *menuname ) { int i; -@@ -1966,6 +2022,7 @@ +@@ -1966,6 +2022,7 @@ menu_t *commands_get_menu( commands_t *c static int set_menu( commands_t *cmd, const char *menuname ) { @@ -388,7 +388,7 @@ int i; if( !menuname || !*menuname ) { -@@ -1981,7 +2038,15 @@ +@@ -1981,7 +2038,15 @@ static int set_menu( commands_t *cmd, co return set_menu( cmd, menu_table[ i ].dest ); } else { cmd->curmenu = menu_table[ i ].menutype; @@ -405,7 +405,7 @@ return 1; } } -@@ -2104,20 +2169,46 @@ +@@ -2104,20 +2169,46 @@ void commands_handle( commands_t *cmd, i if( tvtime_cmd == TVTIME_NOCOMMAND ) return; if( cmd->menuactive && tvtime_is_menu_command( tvtime_cmd ) ) { @@ -458,7 +458,7 @@ break; case TVTIME_MENU_BACK: menu_back( cmd ); break; case TVTIME_MENU_ENTER: menu_enter( cmd ); break; -@@ -2128,6 +2219,9 @@ +@@ -2128,6 +2219,9 @@ void commands_handle( commands_t *cmd, i menu_off( cmd ); } break; @@ -468,7 +468,7 @@ case TVTIME_MOUSE_MOVE: sscanf( arg, "%d %d", &x, &y ); if( cmd->halfsize ) y *= 2; -@@ -2213,6 +2307,24 @@ +@@ -2213,6 +2307,24 @@ void commands_handle( commands_t *cmd, i } break; @@ -493,7 +493,7 @@ case TVTIME_SHOW_EPG: if( cmd->vidin && videoinput_has_tuner( cmd->vidin ) ) { if( cmd->osd ) { -@@ -2897,8 +3009,10 @@ +@@ -2897,8 +3009,10 @@ void commands_handle( commands_t *cmd, i /* Decode the input char from commands. */ if( cmd->digit_counter == 0 ) memset( cmd->next_chan_buffer, 0, 5 ); cmd->next_chan_buffer[ cmd->digit_counter ] = arg[ 0 ]; @@ -506,7 +506,7 @@ /** * Send an enter command if we type more -@@ -3365,21 +3479,46 @@ +@@ -3365,21 +3479,46 @@ void commands_handle( commands_t *cmd, i case TVTIME_ENTER: if( cmd->next_chan_buffer[ 0 ] ) { @@ -566,7 +566,7 @@ } } else { if( cmd->renumbering ) { -@@ -3501,12 +3640,24 @@ +@@ -3501,12 +3640,24 @@ void commands_next_frame( commands_t *cm if( cmd->osd ) tvtime_osd_set_hold_message( cmd->osd, "", 0 ); cmd->renumbering = 0; } @@ -592,7 +592,7 @@ if( !(cmd->frame_counter % 10) ) { strcat( input_text, "_" ); } else { -@@ -3514,6 +3665,11 @@ +@@ -3514,6 +3665,11 @@ void commands_next_frame( commands_t *cm } if( cmd->osd ) { tvtime_osd_set_channel_number( cmd->osd, input_text ); @@ -606,9 +606,9 @@ } Index: tvtime-1.0.2/docs/man/de/tvtime-command.1 =================================================================== ---- tvtime-1.0.2.orig/docs/man/de/tvtime-command.1 2014-06-11 09:20:25.628028482 +0000 -+++ tvtime-1.0.2/docs/man/de/tvtime-command.1 2014-06-11 09:20:25.624028482 +0000 -@@ -86,6 +86,10 @@ +--- tvtime-1.0.2.orig/docs/man/de/tvtime-command.1 ++++ tvtime-1.0.2/docs/man/de/tvtime-command.1 +@@ -86,6 +86,10 @@ zwischen zwei Sendern hin\- und herzuspr auseinanderliegen. .TP @@ -621,9 +621,9 @@ Funktion tauscht den Speicherplatz des gerade aktiven Kanals mit dem, dessen Index: tvtime-1.0.2/docs/man/en/tvtime-command.1 =================================================================== ---- tvtime-1.0.2.orig/docs/man/en/tvtime-command.1 2014-06-11 09:20:25.628028482 +0000 -+++ tvtime-1.0.2/docs/man/en/tvtime-command.1 2014-06-11 09:20:25.624028482 +0000 -@@ -82,6 +82,10 @@ +--- tvtime-1.0.2.orig/docs/man/en/tvtime-command.1 ++++ tvtime-1.0.2/docs/man/en/tvtime-command.1 +@@ -82,6 +82,10 @@ Changes to the last channel you were at. forth between two programs on distant channels. .TP @@ -636,9 +636,9 @@ the number you type in. Use this to configure your station list to suit Index: tvtime-1.0.2/docs/man/es/tvtime-command.1 =================================================================== ---- tvtime-1.0.2.orig/docs/man/es/tvtime-command.1 2014-06-11 09:20:25.628028482 +0000 -+++ tvtime-1.0.2/docs/man/es/tvtime-command.1 2014-06-11 09:20:25.624028482 +0000 -@@ -88,6 +88,10 @@ +--- tvtime-1.0.2.orig/docs/man/es/tvtime-command.1 ++++ tvtime-1.0.2/docs/man/es/tvtime-command.1 +@@ -88,6 +88,10 @@ Cambia al canal que estabas viendo antes para hacer zapping entre dos programas que están en canales distantes. .TP @@ -651,9 +651,9 @@ que escribas. Úsalo para configurar tu lista de canales para acomodarla Index: tvtime-1.0.2/docs/man/de/tvtime.1 =================================================================== ---- tvtime-1.0.2.orig/docs/man/de/tvtime.1 2014-06-11 09:20:25.628028482 +0000 -+++ tvtime-1.0.2/docs/man/de/tvtime.1 2014-06-11 09:20:25.624028482 +0000 -@@ -72,6 +72,9 @@ +--- tvtime-1.0.2.orig/docs/man/de/tvtime.1 ++++ tvtime-1.0.2/docs/man/de/tvtime.1 +@@ -72,6 +72,9 @@ Beenden .I F1 oder Tab Menü anzeigen .TP @@ -665,9 +665,9 @@ .TP Index: tvtime-1.0.2/docs/man/en/tvtime.1 =================================================================== ---- tvtime-1.0.2.orig/docs/man/en/tvtime.1 2014-06-11 09:20:25.628028482 +0000 -+++ tvtime-1.0.2/docs/man/en/tvtime.1 2014-06-11 09:20:25.624028482 +0000 -@@ -69,6 +69,9 @@ +--- tvtime-1.0.2.orig/docs/man/en/tvtime.1 ++++ tvtime-1.0.2/docs/man/en/tvtime.1 +@@ -69,6 +69,9 @@ Quit .I F1 or tab Show menu .TP @@ -679,9 +679,9 @@ .TP Index: tvtime-1.0.2/docs/man/es/tvtime.1 =================================================================== ---- tvtime-1.0.2.orig/docs/man/es/tvtime.1 2014-06-11 09:20:25.628028482 +0000 -+++ tvtime-1.0.2/docs/man/es/tvtime.1 2014-06-11 09:20:25.624028482 +0000 -@@ -75,6 +75,9 @@ +--- tvtime-1.0.2.orig/docs/man/es/tvtime.1 ++++ tvtime-1.0.2/docs/man/es/tvtime.1 +@@ -75,6 +75,9 @@ Salir .I F1 o tabulador Mostrar menú .TP reverted: --- tvtime-1.0.2/debian/patches/tvtime-1.0.2-videoinput.patch +++ tvtime-1.0.2.orig/debian/patches/tvtime-1.0.2-videoinput.patch @@ -1,18 +0,0 @@ -## Description: tvtime does not work with UVC webcams -## Origin: upstream, http://pkgs.fedoraproject.org/gitweb/?p=tvtime.git;a=patch;h=f93446d369f3bb5b5db4196de196d81580b57d04 -## Bug-Ubuntu: http://launchpad.net/bugs/383669 -## Bug-Debian: -## Author: Tomas Smetana -## Forwarded: not-needed -Index: tvtime-1.0.2/src/videoinput.c -=================================================================== ---- tvtime-1.0.2.orig/src/videoinput.c 2014-04-28 06:28:09.044908425 +0000 -+++ tvtime-1.0.2/src/videoinput.c 2014-04-28 06:28:09.040908425 +0000 -@@ -386,6 +386,7 @@ - - videoinput_get_aspect( vidin ); - cur_buf.type = vidin->capbuffers[ 0 ].vidbuf.type; -+ cur_buf.memory = vidin->capbuffers[ 0 ].vidbuf.memory; - if( ioctl( vidin->grab_fd, VIDIOC_DQBUF, &cur_buf ) < 0 ) { - /* some drivers return EIO when there is no signal */ - if( errno != EIO ) { only in patch2: unchanged: --- tvtime-1.0.2.orig/debian/patches/tvtime-1.0.2-uvc.patch +++ tvtime-1.0.2/debian/patches/tvtime-1.0.2-uvc.patch @@ -0,0 +1,33 @@ +Description: tvtime does not work with UVC webcams +Bug-Ubuntu: http://launchpad.net/bugs/383669 +Author: POJAR GEORGE +Index: tvtime-1.0.2/src/videoinput.c +=================================================================== +--- tvtime-1.0.2.orig/src/videoinput.c ++++ tvtime-1.0.2/src/videoinput.c +@@ -386,6 +386,7 @@ uint8_t *videoinput_next_frame( videoinp + + videoinput_get_aspect( vidin ); + cur_buf.type = vidin->capbuffers[ 0 ].vidbuf.type; ++ cur_buf.memory = vidin->capbuffers[ 0 ].vidbuf.memory; + if( ioctl( vidin->grab_fd, VIDIOC_DQBUF, &cur_buf ) < 0 ) { + /* some drivers return EIO when there is no signal */ + if( errno != EIO ) { +@@ -733,11 +734,13 @@ videoinput_t *videoinput_new( const char + if( vidin->height != imgformat.fmt.pix.height ) { + fprintf( stderr, "\n" + " Your capture card driver: %s\n" +- " does not support full size studio-quality images required by tvtime.\n" +- " This is true for many low-quality webcams. Please select a\n" ++ " does not support images with height %d required by tvtime.\n" ++ " This is true for many webcams. Please select a\n" + " different video device for tvtime to use with the command line\n" +- " option --device.\n\n", vidin->drivername ); +- sprintf( error_string, "Frames too short from %s", vidin->shortdriver ); ++ " option --device.\n\n", vidin->drivername, vidin->height); ++ sprintf( error_string, "%s: frames height adjusted to %d (wanted %d)", ++ vidin->shortdriver, ++ imgformat.fmt.pix.height, vidin->height); + close( vidin->grab_fd ); + free( vidin ); + return 0;