r130 - in unstable/vlc/debian: . patches
Samuel Hocevar
sho at alioth.debian.org
Wed Mar 14 14:21:41 CET 2007
Author: sho
Date: 2007-01-09 09:59:23 +0000 (Tue, 09 Jan 2007)
New Revision: 130
Modified:
unstable/vlc/debian/changelog
unstable/vlc/debian/patches/patch-documentation-0.8.6debian-0.8.6a.diff
Log:
vlc (0.8.6-svn20061012.debian-3) unstable; urgency=low
* patch-documentation-0.8.6debian-0.8.6a.diff:
+ Stripped down patch, removing stuff that might cause regressions (haha).
-- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Tue, 9 Jan 2007 10:58:39 +0100
Modified: unstable/vlc/debian/changelog
===================================================================
--- unstable/vlc/debian/changelog 2007-01-08 10:07:12 UTC (rev 129)
+++ unstable/vlc/debian/changelog 2007-01-09 09:59:23 UTC (rev 130)
@@ -1,3 +1,10 @@
+vlc (0.8.6-svn20061012.debian-3) unstable; urgency=low
+
+ * patch-documentation-0.8.6debian-0.8.6a.diff:
+ + Stripped down patch, removing stuff that might cause regressions (haha).
+
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Tue, 9 Jan 2007 10:58:39 +0100
+
vlc (0.8.6-svn20061012.debian-2) unstable; urgency=high
* Maintainer upload.
Modified: unstable/vlc/debian/patches/patch-documentation-0.8.6debian-0.8.6a.diff
===================================================================
--- unstable/vlc/debian/patches/patch-documentation-0.8.6debian-0.8.6a.diff 2007-01-08 10:07:12 UTC (rev 129)
+++ unstable/vlc/debian/patches/patch-documentation-0.8.6debian-0.8.6a.diff 2007-01-09 09:59:23 UTC (rev 130)
@@ -1,16 +1,3 @@
-Index: vlc-0.8.6-svn20061012.debian/src/interface/interface.c
-===================================================================
---- vlc-0.8.6-svn20061012.debian.orig/src/interface/interface.c 2006-10-12 19:47:01.000000000 +0200
-+++ vlc-0.8.6-svn20061012.debian/src/interface/interface.c 2007-01-08 02:19:00.000000000 +0100
-@@ -375,7 +375,7 @@
- text.psz_string = _("Add Interface");
- var_Change( p_intf, "intf-add", VLC_VAR_SETTEXT, &text, NULL );
-
-- val.psz_string = "rc"; text.psz_string = "Console";
-+ val.psz_string = "rc"; text.psz_string = _("Console");
- var_Change( p_intf, "intf-add", VLC_VAR_ADDCHOICE, &val, &text );
- val.psz_string = "telnet"; text.psz_string = _("Telnet Interface");
- var_Change( p_intf, "intf-add", VLC_VAR_ADDCHOICE, &val, &text );
Index: vlc-0.8.6-svn20061012.debian/configure.ac
===================================================================
--- vlc-0.8.6-svn20061012.debian.orig/configure.ac 2007-01-08 02:18:44.000000000 +0100
@@ -52,26 +39,6 @@
goto error;
}
-Index: vlc-0.8.6-svn20061012.debian/include/codecs.h
-===================================================================
---- vlc-0.8.6-svn20061012.debian.orig/include/codecs.h 2006-09-18 12:28:45.000000000 +0200
-+++ vlc-0.8.6-svn20061012.debian/include/codecs.h 2007-01-08 02:19:00.000000000 +0100
-@@ -243,6 +243,7 @@
- #define WAVE_FORMAT_VORB_2PLUS 0x6770
- #define WAVE_FORMAT_VORB_3 0x6751
- #define WAVE_FORMAT_VORB_3PLUS 0x6771
-+#define WAVE_FORMAT_SPEEX 0xa109 /* Speex audio */
-
-
- #if !defined(WAVE_FORMAT_EXTENSIBLE)
-@@ -322,6 +323,7 @@
- { WAVE_FORMAT_VORB_2PLUS, VLC_FOURCC( 'v', 'o', '2', '+' ), "Vorbis 2+ Audio" },
- { WAVE_FORMAT_VORB_3, VLC_FOURCC( 'v', 'o', 'r', '3' ), "Vorbis 3 Audio" },
- { WAVE_FORMAT_VORB_3PLUS, VLC_FOURCC( 'v', 'o', '3', '+' ), "Vorbis 3+ Audio" },
-+ { WAVE_FORMAT_SPEEX, VLC_FOURCC( 's', 'p', 'x', ' ' ), "Speex Audio" },
- { WAVE_FORMAT_UNKNOWN, VLC_FOURCC( 'u', 'n', 'd', 'f' ), "Unknown" }
- };
-
Index: vlc-0.8.6-svn20061012.debian/modules/codec/x264.c
===================================================================
--- vlc-0.8.6-svn20061012.debian.orig/modules/codec/x264.c 2006-10-12 19:47:07.000000000 +0200
@@ -130,95 +97,6 @@
#endif
vlc_module_begin();
-@@ -374,14 +373,14 @@
-
- add_integer( SOUT_CFG_PREFIX "ref", 1, NULL, REF_TEXT,
- REF_LONGTEXT, VLC_FALSE );
-- add_deprecated( SOUT_CFG_PREFIX "frameref", VLC_FALSE ); /* Deprecated since 0.8.5 */
- change_integer_range( 1, 16 );
-+ add_deprecated( SOUT_CFG_PREFIX "frameref", VLC_FALSE ); /* Deprecated since 0.8.5 */
-
- add_bool( SOUT_CFG_PREFIX "nf", 0, NULL, NF_TEXT,
- NF_LONGTEXT, VLC_FALSE );
- add_deprecated( SOUT_CFG_PREFIX "loopfilter", VLC_FALSE ); /* Deprecated since 0.8.5 */
-
-- add_string( SOUT_CFG_PREFIX "deblock", "", NULL, FILTER_TEXT,
-+ add_string( SOUT_CFG_PREFIX "deblock", "0:0", NULL, FILTER_TEXT,
- FILTER_LONGTEXT, VLC_FALSE );
- add_deprecated( SOUT_CFG_PREFIX "filter", VLC_FALSE ); /* Deprecated since 0.8.6 */
-
-@@ -407,13 +406,13 @@
-
- add_integer( SOUT_CFG_PREFIX "qpmin", 10, NULL, QPMIN_TEXT,
- QPMIN_LONGTEXT, VLC_FALSE );
-- add_deprecated( SOUT_CFG_PREFIX "qp-min", VLC_FALSE ); /* Deprecated since 0.8.5 */
- change_integer_range( 0, 51 );
-+ add_deprecated( SOUT_CFG_PREFIX "qp-min", VLC_FALSE ); /* Deprecated since 0.8.5 */
-
- add_integer( SOUT_CFG_PREFIX "qpmax", 51, NULL, QPMAX_TEXT,
- QPMAX_LONGTEXT, VLC_FALSE );
-- add_deprecated( SOUT_CFG_PREFIX "qp-max", VLC_FALSE ); /* Deprecated since 0.8.5 */
- change_integer_range( 0, 51 );
-+ add_deprecated( SOUT_CFG_PREFIX "qp-max", VLC_FALSE ); /* Deprecated since 0.8.5 */
-
- add_integer( SOUT_CFG_PREFIX "qpstep", 4, NULL, QPSTEP_TEXT,
- QPSTEP_LONGTEXT, VLC_FALSE );
-@@ -421,8 +420,8 @@
-
- add_float( SOUT_CFG_PREFIX "ratetol", 1.0, NULL, RATETOL_TEXT,
- RATETOL_LONGTEXT, VLC_FALSE );
-- add_deprecated( SOUT_CFG_PREFIX "tolerance", VLC_FALSE ); /* Deprecated since 0.8.5 */
- change_float_range( 0, 100 );
-+ add_deprecated( SOUT_CFG_PREFIX "tolerance", VLC_FALSE ); /* Deprecated since 0.8.5 */
-
- add_integer( SOUT_CFG_PREFIX "vbv-maxrate", 0, NULL, VBV_MAXRATE_TEXT,
- VBV_MAXRATE_LONGTEXT, VLC_FALSE );
-@@ -462,8 +461,8 @@
- /* x264 partitions = none (default). set at least "normal" mode. */
- add_string( SOUT_CFG_PREFIX "partitions", "normal", NULL, ANALYSE_TEXT,
- ANALYSE_LONGTEXT, VLC_FALSE );
-- add_deprecated( SOUT_CFG_PREFIX "analyse", VLC_FALSE ); /* Deprecated since 0.8.6 */
- change_string_list( enc_analyse_list, enc_analyse_list_text, 0 );
-+ add_deprecated( SOUT_CFG_PREFIX "analyse", VLC_FALSE ); /* Deprecated since 0.8.6 */
-
- add_string( SOUT_CFG_PREFIX "direct", "spatial", NULL, DIRECT_PRED_TEXT,
- DIRECT_PRED_LONGTEXT, VLC_FALSE );
-@@ -492,8 +491,8 @@
-
- add_integer( SOUT_CFG_PREFIX "subme", 5, NULL, SUBME_TEXT,
- SUBME_LONGTEXT, VLC_FALSE );
-- add_deprecated( SOUT_CFG_PREFIX "subpel", VLC_FALSE ); /* Deprecated since 0.8.5 */
- change_integer_range( 1, SUBME_MAX );
-+ add_deprecated( SOUT_CFG_PREFIX "subpel", VLC_FALSE ); /* Deprecated since 0.8.5 */
-
- #if X264_BUILD >= 41 /* r368 */
- add_bool( SOUT_CFG_PREFIX "b-rdo", 0, NULL, B_RDO_TEXT,
-@@ -554,13 +553,8 @@
-
- /* Input/Output */
-
--#if defined(__DARWIN__) && defined(__INTEL__)
-- add_bool( SOUT_CFG_PREFIX "asm", 0, NULL, ASM_TEXT,
-- ASM_LONGTEXT, VLC_FALSE );
--#else
- add_bool( SOUT_CFG_PREFIX "asm", 1, NULL, ASM_TEXT,
- ASM_LONGTEXT, VLC_FALSE );
--#endif
-
- /* x264 psnr = 1 (default). disable PSNR computation for speed. */
- add_bool( SOUT_CFG_PREFIX "psnr", 0, NULL, PSNR_TEXT,
-@@ -916,7 +910,11 @@
- var_Get( p_enc, SOUT_CFG_PREFIX "crf", &val );
- if( val.i_int > 0 && val.i_int <= 51 )
- {
-+#if X264_BUILD >= 54
-+ p_sys->param.rc.f_rf_constant = val.i_int;
-+#else
- p_sys->param.rc.i_rf_constant = val.i_int;
-+#endif
- #if X264_BUILD >= 48
- p_sys->param.rc.i_rc_method = X264_RC_CRF;
- #endif
Index: vlc-0.8.6-svn20061012.debian/NEWS
===================================================================
--- vlc-0.8.6-svn20061012.debian.orig/NEWS 2006-10-12 19:47:40.000000000 +0200
@@ -338,56 +216,6 @@
#endif
static char *ppsz_snap_formats[] =
-@@ -1097,6 +1097,8 @@
-
- #define RECORD_KEY_TEXT N_("Record")
- #define RECORD_KEY_LONGTEXT N_("Record access filter start/stop.")
-+#define DUMP_KEY_TEXT N_("Dump")
-+#define DUMP_KEY_LONGTEXT N_("Media dump access filter trigger.")
-
- #define UNZOOM_KEY_TEXT N_("Un-Zoom")
- #define UNZOOM_KEY_LONGTEXT N_("Un-Zoom")
-@@ -1730,6 +1732,7 @@
- # define KEY_HISTORY_BACK KEY_MODIFIER_COMMAND|'['
- # define KEY_HISTORY_FORWARD KEY_MODIFIER_COMMAND|']'
- # define KEY_RECORD KEY_MODIFIER_COMMAND|KEY_MODIFIER_SHIFT|'r'
-+# define KEY_DUMP KEY_MODIFIER_COMMAND|KEY_MODIFIER_SHIFT|'d'
-
- #else
- # define KEY_FULLSCREEN 'f'
-@@ -1810,6 +1813,7 @@
- # define KEY_HISTORY_BACK KEY_MODIFIER_CTRL|'v'
- # define KEY_HISTORY_FORWARD KEY_MODIFIER_CTRL|'b'
- # define KEY_RECORD KEY_MODIFIER_CTRL|'r'
-+# define KEY_DUMP KEY_MODIFIER_CTRL|KEY_MODIFIER_SHIFT|'d'
- #endif
-
- add_key( "key-fullscreen", KEY_FULLSCREEN, NULL, FULLSCREEN_KEY_TEXT,
-@@ -1907,6 +1911,8 @@
- HISTORY_FORWARD_TEXT, HISTORY_FORWARD_LONGTEXT, VLC_TRUE );
- add_key( "key-record", KEY_RECORD, NULL,
- RECORD_KEY_TEXT, RECORD_KEY_LONGTEXT, VLC_TRUE );
-+ add_key( "key-dump", KEY_DUMP, NULL,
-+ DUMP_KEY_TEXT, DUMP_KEY_LONGTEXT, VLC_TRUE );
-
- add_key( "key-crop-top", KEY_CROP_TOP, NULL,
- CROP_TOP_KEY_TEXT, CROP_TOP_KEY_LONGTEXT, VLC_TRUE );
-@@ -2119,5 +2125,6 @@
- { "key-history-back", ACTIONID_HISTORY_BACK, 0, 0, 0, 0 },
- { "key-history-forward", ACTIONID_HISTORY_FORWARD, 0, 0, 0, 0 },
- { "key-record", ACTIONID_RECORD, 0, 0, 0, 0 },
-+ { "key-dump", ACTIONID_DUMP, 0, 0, 0, 0 },
- { NULL, 0, 0, 0, 0, 0 }
- };
-Index: vlc-0.8.6-svn20061012.debian/include/vlc_keys.h
-===================================================================
---- vlc-0.8.6-svn20061012.debian.orig/include/vlc_keys.h 2006-09-18 12:28:45.000000000 +0200
-+++ vlc-0.8.6-svn20061012.debian/include/vlc_keys.h 2007-01-08 02:19:00.000000000 +0100
-@@ -298,3 +298,4 @@
- #define ACTIONID_UNCROP_BOTTOM 77
- #define ACTIONID_CROP_RIGHT 78
- #define ACTIONID_UNCROP_RIGHT 79
-+#define ACTIONID_DUMP 80
Index: vlc-0.8.6-svn20061012.debian/THANKS
===================================================================
--- vlc-0.8.6-svn20061012.debian.orig/THANKS 2006-10-12 19:47:40.000000000 +0200
@@ -445,143 +273,3 @@
Vitalijus Slavinskas <Vitalijus.Slavinskas at stud.ktu dot lt> - nsv patches
Vitaly V. Bursov <vitalyvb at ukr dot net>
Vladimir Chernyshov - MMX motion optimizations
-Index: vlc-0.8.6-svn20061012.debian/modules/video_filter/mosaic.c
-===================================================================
---- vlc-0.8.6-svn20061012.debian.orig/modules/video_filter/mosaic.c 2006-10-12 19:47:07.000000000 +0200
-+++ vlc-0.8.6-svn20061012.debian/modules/video_filter/mosaic.c 2007-01-08 02:19:00.000000000 +0100
-@@ -72,7 +72,7 @@
- int i_cols, i_rows; /* mosaic rows and cols */
- int i_align; /* mosaic alignment in background video */
- int i_xoffset, i_yoffset; /* top left corner offset */
-- int i_vborder, i_hborder; /* border width/height between miniatures */
-+ int i_borderw, i_borderh; /* border width/height between miniatures */
- int i_alpha; /* subfilter alpha blending */
-
- vlc_bool_t b_bs; /* Bluescreen vars */
-@@ -100,12 +100,10 @@
- #define XOFFSET_LONGTEXT N_("X Coordinate of the top-left corner of the mosaic.")
- #define YOFFSET_TEXT N_("Top left corner Y coordinate")
- #define YOFFSET_LONGTEXT N_("Y Coordinate of the top-left corner of the mosaic.")
--#define VBORDER_TEXT N_("Vertical border width")
--#define VBORDER_LONGTEXT N_( "Width in pixels of the border than can be "\
-- "drawn vertically around the mosaic." )
--#define HBORDER_TEXT N_("Horizontal border width")
--#define HBORDER_LONGTEXT N_( "Width in pixels of the border than can "\
-- "be drawn horizontally around the mosaic." )
-+#define BORDERW_TEXT N_("Border width")
-+#define BORDERW_LONGTEXT N_( "Width in pixels of the border between miniatures." )
-+#define BORDERH_TEXT N_("Border height")
-+#define BORDERH_LONGTEXT N_( "Height in pixels of the border between miniatures." )
-
- #define ALIGN_TEXT N_("Mosaic alignment" )
- #define ALIGN_LONGTEXT N_( \
-@@ -188,8 +186,10 @@
- change_integer_list( pi_align_values, ppsz_align_descriptions, 0 );
- add_integer( "mosaic-xoffset", 0, NULL, XOFFSET_TEXT, XOFFSET_LONGTEXT, VLC_TRUE );
- add_integer( "mosaic-yoffset", 0, NULL, YOFFSET_TEXT, YOFFSET_LONGTEXT, VLC_TRUE );
-- add_integer( "mosaic-vborder", 0, NULL, VBORDER_TEXT, VBORDER_LONGTEXT, VLC_TRUE );
-- add_integer( "mosaic-hborder", 0, NULL, HBORDER_TEXT, HBORDER_LONGTEXT, VLC_TRUE );
-+ add_integer( "mosaic-borderw", 0, NULL, BORDERW_TEXT, BORDERW_LONGTEXT, VLC_TRUE );
-+ add_deprecated( "mosaic-vborder", VLC_FALSE );
-+ add_integer( "mosaic-borderh", 0, NULL, BORDERH_TEXT, BORDERH_LONGTEXT, VLC_TRUE );
-+ add_deprecated( "mosaic-hborder", VLC_FALSE );
-
- add_integer( "mosaic-position", 0, NULL, POS_TEXT, POS_LONGTEXT, VLC_FALSE );
- change_integer_list( pi_pos_values, ppsz_pos_descriptions, 0 );
-@@ -270,8 +270,8 @@
- var_SetInteger( p_libvlc, "mosaic-align", p_sys->i_align );
- var_AddCallback( p_libvlc, "mosaic-align", MosaicCallback, p_sys );
-
-- GET_VAR( vborder, 0, INT_MAX );
-- GET_VAR( hborder, 0, INT_MAX );
-+ GET_VAR( borderw, 0, INT_MAX );
-+ GET_VAR( borderh, 0, INT_MAX );
- GET_VAR( rows, 1, INT_MAX );
- GET_VAR( cols, 1, INT_MAX );
- GET_VAR( alpha, 0, 255 );
-@@ -366,8 +366,8 @@
- var_Destroy( p_libvlc, "mosaic-width" );
- var_Destroy( p_libvlc, "mosaic-xoffset" );
- var_Destroy( p_libvlc, "mosaic-yoffset" );
-- var_Destroy( p_libvlc, "mosaic-vborder" );
-- var_Destroy( p_libvlc, "mosaic-hborder" );
-+ var_Destroy( p_libvlc, "mosaic-borderw" );
-+ var_Destroy( p_libvlc, "mosaic-borderh" );
- var_Destroy( p_libvlc, "mosaic-position" );
- var_Destroy( p_libvlc, "mosaic-rows" );
- var_Destroy( p_libvlc, "mosaic-cols" );
-@@ -473,9 +473,9 @@
- }
-
- col_inner_width = ( ( p_sys->i_width - ( p_sys->i_cols - 1 )
-- * p_sys->i_vborder ) / p_sys->i_cols );
-+ * p_sys->i_borderw ) / p_sys->i_cols );
- row_inner_height = ( ( p_sys->i_height - ( p_sys->i_rows - 1 )
-- * p_sys->i_hborder ) / p_sys->i_rows );
-+ * p_sys->i_borderh ) / p_sys->i_rows );
-
- i_real_index = 0;
-
-@@ -701,14 +701,14 @@
- whole rectangle area or it's larger than the rectangle */
- p_region->i_x = p_sys->i_xoffset
- + i_col * ( p_sys->i_width / p_sys->i_cols )
-- + ( i_col * p_sys->i_vborder ) / p_sys->i_cols;
-+ + ( i_col * p_sys->i_borderw ) / p_sys->i_cols;
- }
- else
- {
- /* center the video in the dedicated rectangle */
- p_region->i_x = p_sys->i_xoffset
- + i_col * ( p_sys->i_width / p_sys->i_cols )
-- + ( i_col * p_sys->i_vborder ) / p_sys->i_cols
-+ + ( i_col * p_sys->i_borderw ) / p_sys->i_cols
- + ( col_inner_width - fmt_out.i_width ) / 2;
- }
-
-@@ -719,14 +719,14 @@
- whole rectangle area or it's taller than the rectangle */
- p_region->i_y = p_sys->i_yoffset
- + i_row * ( p_sys->i_height / p_sys->i_rows )
-- + ( i_row * p_sys->i_hborder ) / p_sys->i_rows;
-+ + ( i_row * p_sys->i_borderh ) / p_sys->i_rows;
- }
- else
- {
- /* center the video in the dedicated rectangle */
- p_region->i_y = p_sys->i_yoffset
- + i_row * ( p_sys->i_height / p_sys->i_rows )
-- + ( i_row * p_sys->i_hborder ) / p_sys->i_rows
-+ + ( i_row * p_sys->i_borderh ) / p_sys->i_rows
- + ( row_inner_height - fmt_out.i_height ) / 2;
- }
-
-@@ -811,20 +811,20 @@
- p_sys->i_align = newval.i_int;
- vlc_mutex_unlock( &p_sys->lock );
- }
-- else if( !strcmp( psz_var, "mosaic-vborder" ) )
-+ else if( !strcmp( psz_var, "mosaic-borderw" ) )
- {
- vlc_mutex_lock( &p_sys->lock );
-- msg_Dbg( p_this, "changing vertical border from %dpx to %dpx",
-- p_sys->i_vborder, newval.i_int );
-- p_sys->i_vborder = __MAX( newval.i_int, 0 );
-+ msg_Dbg( p_this, "changing border width from %dpx to %dpx",
-+ p_sys->i_borderw, newval.i_int );
-+ p_sys->i_borderw = __MAX( newval.i_int, 0 );
- vlc_mutex_unlock( &p_sys->lock );
- }
-- else if( !strcmp( psz_var, "mosaic-hborder" ) )
-+ else if( !strcmp( psz_var, "mosaic-borderh" ) )
- {
- vlc_mutex_lock( &p_sys->lock );
-- msg_Dbg( p_this, "changing horizontal border from %dpx to %dpx",
-- p_sys->i_vborder, newval.i_int );
-- p_sys->i_hborder = __MAX( newval.i_int, 0 );
-+ msg_Dbg( p_this, "changing border height from %dpx to %dpx",
-+ p_sys->i_borderh, newval.i_int );
-+ p_sys->i_borderh = __MAX( newval.i_int, 0 );
- vlc_mutex_unlock( &p_sys->lock );
- }
- else if( !strcmp( psz_var, "mosaic-position" ) )
More information about the Pkg-multimedia-commits
mailing list