[SCM] vlc/master: Drop patches included upstream
sramacher at users.alioth.debian.org
sramacher at users.alioth.debian.org
Sun Nov 19 12:42:41 UTC 2017
The following commit has been merged in the master branch:
commit d67d13daa80e87248672a4c4ecec7763b7dbbabe
Author: Sebastian Ramacher <sramacher at debian.org>
Date: Sun Nov 19 13:40:42 2017 +0100
Drop patches included upstream
diff --git a/debian/patches/0001-Revert-invalid-translations.patch b/debian/patches/0001-Revert-invalid-translations.patch
index b7b9cb0..7102543 100644
--- a/debian/patches/0001-Revert-invalid-translations.patch
+++ b/debian/patches/0001-Revert-invalid-translations.patch
@@ -9,10 +9,10 @@ Bug-Debian: https://bugs.debian.org/814258
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/po/mr.po b/po/mr.po
-index 831b622..11b96b4 100644
+index e560aa6..c54004b 100644
--- a/po/mr.po
+++ b/po/mr.po
-@@ -21567,7 +21567,7 @@ msgstr "चालविण्याची यादी"
+@@ -21466,7 +21466,7 @@ msgstr "चालविण्याची यादी"
#: modules/gui/qt4/menus.cpp:493
msgid "Ctrl+L"
@@ -21,7 +21,7 @@ index 831b622..11b96b4 100644
#: modules/gui/qt4/menus.cpp:496
msgid "Docked Playlist"
-@@ -21579,7 +21579,7 @@ msgstr "किमान आंतरपृष्ठ"
+@@ -21478,7 +21478,7 @@ msgstr "किमान आंतरपृष्ठ"
#: modules/gui/qt4/menus.cpp:508
msgid "Ctrl+H"
@@ -30,7 +30,7 @@ index 831b622..11b96b4 100644
#: modules/gui/qt4/menus.cpp:517
msgid "&Fullscreen Interface"
-@@ -21735,7 +21735,7 @@ msgstr "मागे उडी मारा"
+@@ -21634,7 +21634,7 @@ msgstr "मागे उडी मारा"
#: modules/gui/qt4/menus.cpp:920
msgid "Ctrl+T"
diff --git a/debian/patches/0011-codec-avcodec-check-avcodec-visible-sizes.patch b/debian/patches/0011-codec-avcodec-check-avcodec-visible-sizes.patch
deleted file mode 100644
index 9955126..0000000
--- a/debian/patches/0011-codec-avcodec-check-avcodec-visible-sizes.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From: Francois Cartegnie <fcvlcdev at free.fr>
-Date: Thu, 29 Jun 2017 09:45:20 +0200
-Subject: codec: avcodec: check avcodec visible sizes
-
-refs #18467
----
- modules/codec/avcodec/video.c | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/modules/codec/avcodec/video.c b/modules/codec/avcodec/video.c
-index a19e7f6..b8b713f 100644
---- a/modules/codec/avcodec/video.c
-+++ b/modules/codec/avcodec/video.c
-@@ -137,9 +137,11 @@ static inline picture_t *ffmpeg_NewPictBuf( decoder_t *p_dec,
- }
-
-
-- if( width == 0 || height == 0 || width > 8192 || height > 8192 )
-+ if( width == 0 || height == 0 || width > 8192 || height > 8192 ||
-+ width < p_context->width || height < p_context->height )
- {
-- msg_Err( p_dec, "Invalid frame size %dx%d.", width, height );
-+ msg_Err( p_dec, "Invalid frame size %dx%d. vsz %dx%d",
-+ width, height, p_context->width, p_context->height );
- return NULL; /* invalid display size */
- }
- p_dec->fmt_out.video.i_width = width;
diff --git a/debian/patches/0012-decoder-check-visible-size-when-creating-buffer.patch b/debian/patches/0012-decoder-check-visible-size-when-creating-buffer.patch
deleted file mode 100644
index 9601a20..0000000
--- a/debian/patches/0012-decoder-check-visible-size-when-creating-buffer.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From: Francois Cartegnie <fcvlcdev at free.fr>
-Date: Thu, 29 Jun 2017 11:09:02 +0200
-Subject: decoder: check visible size when creating buffer
-
-early reject invalid visible size
-mishandled by filters.
-
-refs #18467
----
- src/input/decoder.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/src/input/decoder.c b/src/input/decoder.c
-index 9f7dc18..cfc15ed 100644
---- a/src/input/decoder.c
-+++ b/src/input/decoder.c
-@@ -2060,7 +2060,9 @@ static picture_t *vout_new_buffer( decoder_t *p_dec )
- vout_thread_t *p_vout;
-
- if( !p_dec->fmt_out.video.i_width ||
-- !p_dec->fmt_out.video.i_height )
-+ !p_dec->fmt_out.video.i_height ||
-+ p_dec->fmt_out.video.i_width < p_dec->fmt_out.video.i_visible_width ||
-+ p_dec->fmt_out.video.i_height < p_dec->fmt_out.video.i_visible_height )
- {
- /* Can't create a new vout without display size */
- return NULL;
diff --git a/debian/patches/0013-codec-flac-fix-heap-write-overflow-on-frame-format-c.patch b/debian/patches/0013-codec-flac-fix-heap-write-overflow-on-frame-format-c.patch
deleted file mode 100644
index 9e817cf..0000000
--- a/debian/patches/0013-codec-flac-fix-heap-write-overflow-on-frame-format-c.patch
+++ /dev/null
@@ -1,154 +0,0 @@
-From: Francois Cartegnie <fcvlcdev at free.fr>
-Date: Wed, 31 May 2017 13:02:29 +0200
-Subject: codec: flac: fix heap write overflow on frame format change
-
-bp of 83b646f1e8fb89f99064d9aaef3754ccc77bbeac
----
- modules/codec/flac.c | 92 +++++++++++++++++++++++++++++++++++-----------------
- 1 file changed, 63 insertions(+), 29 deletions(-)
-
-diff --git a/modules/codec/flac.c b/modules/codec/flac.c
-index 8ab1cb4..8cb1222 100644
---- a/modules/codec/flac.c
-+++ b/modules/codec/flac.c
-@@ -64,6 +64,8 @@ struct decoder_sys_t
- */
- FLAC__StreamDecoder *p_flac;
- FLAC__StreamMetadata_StreamInfo stream_info;
-+
-+ uint8_t rgi_channels_reorder[AOUT_CHAN_MAX];
- bool b_stream_info;
- };
-
-@@ -87,6 +89,19 @@ static const int pi_channels_maps[9] =
- | AOUT_CHAN_LFE
- };
-
-+/* XXX it supposes our internal format is WG4 */
-+static const uint8_t ppi_reorder[1+8][8] = {
-+ { },
-+ { 0, },
-+ { 0, 1 },
-+ { 0, 1, 2 },
-+ { 0, 1, 2, 3 },
-+ { 0, 1, 3, 4, 2 },
-+ { 0, 1, 4, 5, 2, 3 },
-+ { 0, 1, 5, 6, 4, 2, 3 },
-+ { 0, 1, 6, 7, 4, 5, 2, 3 },
-+};
-+
- /*****************************************************************************
- * Local prototypes
- *****************************************************************************/
-@@ -142,6 +157,29 @@ static void Interleave( int32_t *p_out, const int32_t * const *pp_in,
- }
- }
-
-+/*****************************************************************************
-+ * DecoderSetOutputFormat: helper function to convert and check frame format
-+ *****************************************************************************/
-+static int DecoderSetOutputFormat( unsigned i_channels, unsigned i_rate,
-+ unsigned i_streaminfo_rate,
-+ unsigned i_bitspersample,
-+ audio_format_t *fmt,
-+ uint8_t *pi_channels_reorder )
-+{
-+ if( i_channels == 0 || i_channels > FLAC__MAX_CHANNELS ||
-+ i_bitspersample == 0 || (i_rate == 0 && i_streaminfo_rate == 0) )
-+ return VLC_EGENERIC;
-+
-+ fmt->i_channels = i_channels;
-+ fmt->i_rate = (i_rate > 0 ) ? i_rate : i_streaminfo_rate;
-+ fmt->i_physical_channels =
-+ fmt->i_original_channels = pi_channels_maps[i_channels];
-+ memcpy( pi_channels_reorder, ppi_reorder[i_channels], i_channels );
-+ fmt->i_bitspersample = i_bitspersample;
-+
-+ return VLC_SUCCESS;
-+}
-+
- /*****************************************************************************
- * DecoderWriteCallback: called by libflac to output decoded samples
- *****************************************************************************/
-@@ -150,30 +188,31 @@ DecoderWriteCallback( const FLAC__StreamDecoder *decoder,
- const FLAC__Frame *frame,
- const FLAC__int32 *const buffer[], void *client_data )
- {
-- /* XXX it supposes our internal format is WG4 */
-- static const unsigned char ppi_reorder[1+8][8] = {
-- { },
-- { 0, },
-- { 0, 1 },
-- { 0, 1, 2 },
-- { 0, 1, 2, 3 },
-- { 0, 1, 3, 4, 2 },
-- { 0, 1, 4, 5, 2, 3 },
-- { 0, 1, 5, 6, 4, 2, 3 },
-- { 0, 1, 6, 7, 4, 5, 2, 3 },
-- };
--
- VLC_UNUSED(decoder);
- decoder_t *p_dec = (decoder_t *)client_data;
- decoder_sys_t *p_sys = p_dec->p_sys;
-
-- if( p_dec->fmt_out.audio.i_channels <= 0 ||
-- p_dec->fmt_out.audio.i_channels > 8 )
-+ if( DecoderSetOutputFormat( frame->header.channels,
-+ frame->header.sample_rate,
-+ p_sys->b_stream_info ? p_sys->stream_info.sample_rate : 0,
-+ frame->header.bits_per_sample,
-+ &p_dec->fmt_out.audio,
-+ p_sys->rgi_channels_reorder ) )
- return FLAC__STREAM_DECODER_WRITE_STATUS_CONTINUE;
-- if( date_Get( &p_sys->end_date ) <= VLC_TS_INVALID )
-+
-+ if( p_sys->end_date.i_divider_num != p_dec->fmt_out.audio.i_rate )
-+ {
-+ if( p_sys->end_date.i_divider_num > 0 )
-+ date_Change( &p_sys->end_date, p_dec->fmt_out.audio.i_rate, 1 );
-+ else
-+ date_Init( &p_sys->end_date, p_dec->fmt_out.audio.i_rate, 1 );
-+ }
-+
-+ if( decoder_UpdateAudioFormat( p_dec ) )
- return FLAC__STREAM_DECODER_WRITE_STATUS_CONTINUE;
-
-- const unsigned char *pi_reorder = ppi_reorder[p_dec->fmt_out.audio.i_channels];
-+ if( date_Get( &p_sys->end_date ) <= VLC_TS_INVALID )
-+ return FLAC__STREAM_DECODER_WRITE_STATUS_CONTINUE;
-
- p_sys->p_aout_buffer =
- decoder_NewAudioBuffer( p_dec, frame->header.blocksize );
-@@ -181,7 +220,8 @@ DecoderWriteCallback( const FLAC__StreamDecoder *decoder,
- if( p_sys->p_aout_buffer == NULL )
- return FLAC__STREAM_DECODER_WRITE_STATUS_CONTINUE;
-
-- Interleave( (int32_t *)p_sys->p_aout_buffer->p_buffer, buffer, pi_reorder,
-+ Interleave( (int32_t *)p_sys->p_aout_buffer->p_buffer, buffer,
-+ p_sys->rgi_channels_reorder ,
- frame->header.channels, frame->header.blocksize,
- frame->header.bits_per_sample );
-
-@@ -233,17 +273,11 @@ static void DecoderMetadataCallback( const FLAC__StreamDecoder *decoder,
- decoder_sys_t *p_sys = p_dec->p_sys;
-
- /* Setup the format */
-- p_dec->fmt_out.audio.i_rate = metadata->data.stream_info.sample_rate;
-- p_dec->fmt_out.audio.i_channels = metadata->data.stream_info.channels;
-- if(metadata->data.stream_info.channels < 9)
-- {
-- p_dec->fmt_out.audio.i_physical_channels =
-- p_dec->fmt_out.audio.i_original_channels =
-- pi_channels_maps[metadata->data.stream_info.channels];
-- }
-- if (!p_dec->fmt_out.audio.i_bitspersample)
-- p_dec->fmt_out.audio.i_bitspersample =
-- metadata->data.stream_info.bits_per_sample;
-+ DecoderSetOutputFormat( metadata->data.stream_info.channels,
-+ metadata->data.stream_info.sample_rate,
-+ metadata->data.stream_info.sample_rate,
-+ metadata->data.stream_info.bits_per_sample,
-+ &p_dec->fmt_out.audio, p_sys->rgi_channels_reorder );
-
- msg_Dbg( p_dec, "channels:%d samplerate:%d bitspersamples:%d",
- p_dec->fmt_out.audio.i_channels, p_dec->fmt_out.audio.i_rate,
diff --git a/debian/patches/0014-upnp-Add-support-for-libupnp-1.8.patch b/debian/patches/0014-upnp-Add-support-for-libupnp-1.8.patch
deleted file mode 100644
index 1bdd10a..0000000
--- a/debian/patches/0014-upnp-Add-support-for-libupnp-1.8.patch
+++ /dev/null
@@ -1,144 +0,0 @@
-From: Sebastian Ramacher <sebastian at ramacher.at>
-Date: Wed, 30 Aug 2017 18:31:34 +0200
-Subject: upnp: Add support for libupnp 1.8
-
-Callbacks now take const void* as second argument and some members can
-only be accessed via getter functions.
-
-Signed-off-by: Sebastian Ramacher <sramacher at debian.org>
-Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
-(cherry picked from commit 3eb4e03512f45c1fa27c7f9a6759e8e7d3905720)
----
- modules/services_discovery/upnp.cpp | 63 ++++++++++++++++++++++++++++++-------
- 1 file changed, 51 insertions(+), 12 deletions(-)
-
-diff --git a/modules/services_discovery/upnp.cpp b/modules/services_discovery/upnp.cpp
-index 4642ff9..ab61c5c 100644
---- a/modules/services_discovery/upnp.cpp
-+++ b/modules/services_discovery/upnp.cpp
-@@ -40,6 +40,44 @@
- #include <assert.h>
- #include <limits.h>
-
-+#if UPNP_VERSION < 10800
-+/*
-+ * Compat functions and typedefs for libupnp prior to 1.8
-+ */
-+typedef void* UpnpEventPtr;
-+typedef Upnp_Discovery UpnpDiscovery;
-+typedef Upnp_Action_Complete UpnpActionComplete;
-+typedef Upnp_Event UpnpEvent;
-+typedef Upnp_Event_Subscribe UpnpEventSubscribe;
-+
-+static const char* UpnpDiscovery_get_Location_cstr( const UpnpDiscovery* p_discovery )
-+{
-+ return p_discovery->Location;
-+}
-+
-+static const char* UpnpDiscovery_get_DeviceID_cstr( const UpnpDiscovery* p_discovery )
-+{
-+ return p_discovery->DeviceId;
-+}
-+
-+static IXML_Document* UpnpActionComplete_get_ActionResult( const UpnpActionComplete* p_result )
-+{
-+ return p_result->ActionResult;
-+}
-+
-+static const char* UpnpEvent_get_SID_cstr( const UpnpEvent* p_e )
-+{
-+ return p_e->Sid;
-+}
-+
-+static const char* UpnpEventSubscribe_get_SID_cstr( const UpnpEventSubscribe* p_s )
-+{
-+ return p_s->Sid;
-+}
-+#else
-+typedef const void* UpnpEventPtr;
-+#endif
-+
- /*
- * Constants
- */
-@@ -80,7 +118,7 @@ vlc_module_end();
- /*
- * Local prototypes
- */
--static int Callback( Upnp_EventType event_type, void* p_event, void* p_user_data );
-+static int Callback( Upnp_EventType event_type, UpnpEventPtr p_event, void* p_user_data );
-
- const char* xml_getChildElementValue( IXML_Element* p_parent,
- const char* psz_tag_name );
-@@ -325,7 +363,7 @@ int xml_getNumber( IXML_Document* p_doc,
- /*
- * Handles all UPnP events
- */
--static int Callback( Upnp_EventType event_type, void* p_event, void* p_user_data )
-+static int Callback( Upnp_EventType event_type, UpnpEventPtr p_event, void* p_user_data )
- {
- services_discovery_t* p_sd = ( services_discovery_t* ) p_user_data;
- services_discovery_sys_t* p_sys = p_sd->p_sys;
-@@ -336,22 +374,23 @@ static int Callback( Upnp_EventType event_type, void* p_event, void* p_user_data
- case UPNP_DISCOVERY_ADVERTISEMENT_ALIVE:
- case UPNP_DISCOVERY_SEARCH_RESULT:
- {
-- struct Upnp_Discovery* p_discovery = ( struct Upnp_Discovery* )p_event;
-+ const UpnpDiscovery* p_discovery = ( const UpnpDiscovery* )p_event;
-
- IXML_Document *p_description_doc = 0;
-
- int i_res;
-- i_res = UpnpDownloadXmlDoc( p_discovery->Location, &p_description_doc );
-+ i_res = UpnpDownloadXmlDoc( UpnpDiscovery_get_Location_cstr( p_discovery ), &p_description_doc );
-+
- if ( i_res != UPNP_E_SUCCESS )
- {
- msg_Warn( p_sd, "Could not download device description! "
- "Fetching data from %s failed: %s",
-- p_discovery->Location, UpnpGetErrorMessage( i_res ) );
-+ UpnpDiscovery_get_Location_cstr( p_discovery ), UpnpGetErrorMessage( i_res ) );
- return i_res;
- }
-
- MediaServer::parseDeviceDescription( p_description_doc,
-- p_discovery->Location, p_sd );
-+ UpnpDiscovery_get_Location_cstr( p_discovery ), p_sd );
-
- ixmlDocument_free( p_description_doc );
- }
-@@ -359,18 +398,18 @@ static int Callback( Upnp_EventType event_type, void* p_event, void* p_user_data
-
- case UPNP_DISCOVERY_ADVERTISEMENT_BYEBYE:
- {
-- struct Upnp_Discovery* p_discovery = ( struct Upnp_Discovery* )p_event;
-+ const UpnpDiscovery* p_discovery = ( const UpnpDiscovery* )p_event;
-
-- p_sys->p_server_list->removeServer( p_discovery->DeviceId );
-+ p_sys->p_server_list->removeServer( UpnpDiscovery_get_DeviceID_cstr( p_discovery ) );
-
- }
- break;
-
- case UPNP_EVENT_RECEIVED:
- {
-- Upnp_Event* p_e = ( Upnp_Event* )p_event;
-+ const UpnpEvent* p_e = ( const UpnpEvent* )p_event;
-
-- MediaServer* p_server = p_sys->p_server_list->getServerBySID( p_e->Sid );
-+ MediaServer* p_server = p_sys->p_server_list->getServerBySID( UpnpEvent_get_SID_cstr( p_e ) );
- if ( p_server ) p_server->fetchContents();
- }
- break;
-@@ -380,9 +419,9 @@ static int Callback( Upnp_EventType event_type, void* p_event, void* p_user_data
- {
- /* Re-subscribe. */
-
-- Upnp_Event_Subscribe* p_s = ( Upnp_Event_Subscribe* )p_event;
-+ const UpnpEventSubscribe* p_s = ( const UpnpEventSubscribe* )p_event;
-
-- MediaServer* p_server = p_sys->p_server_list->getServerBySID( p_s->Sid );
-+ MediaServer* p_server = p_sys->p_server_list->getServerBySID( UpnpEventSubscribe_get_SID_cstr( p_s ) );
- if ( p_server ) p_server->subscribeToContentDirectory();
- }
- break;
diff --git a/debian/patches/series b/debian/patches/series
index 21de7e1..e061915 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,7 +8,3 @@
0008-desktop-file-We-understand-gvp-and-ram-format.patch
0009-desktop-file-more-mimetypes-from-iana.org.patch
0010-MKV-support-WebVTT-subtitles-embedded.patch
-0011-codec-avcodec-check-avcodec-visible-sizes.patch
-0012-decoder-check-visible-size-when-creating-buffer.patch
-0013-codec-flac-fix-heap-write-overflow-on-frame-format-c.patch
-0014-upnp-Add-support-for-libupnp-1.8.patch
--
VLC media player packaging
More information about the pkg-multimedia-commits
mailing list