[SCM] vlc/master: New upstream release. debian/patches: - Refresh fix-translation.patch: remove parts included upstream. - Remove qt4-Fix-resume-where-you-left-off.patch, qt4-input_manager-Always-reset-lastURI-when-stopping.patch, avcodec-pass-consistent-dimensions-to-hardware-decod.patch: included upstream.
mati75-guest at users.alioth.debian.org
mati75-guest at users.alioth.debian.org
Fri Apr 29 06:58:10 UTC 2016
The following commit has been merged in the master branch:
commit d9d47abc61542ac1de80d6a4bc836d8537fbeb68
Author: Mateusz Łukasik <mati75 at linuxmint.pl>
Date: Fri Apr 29 08:57:57 2016 +0200
New upstream release.
debian/patches:
- Refresh fix-translation.patch: remove parts included upstream.
- Remove qt4-Fix-resume-where-you-left-off.patch,
qt4-input_manager-Always-reset-lastURI-when-stopping.patch,
avcodec-pass-consistent-dimensions-to-hardware-decod.patch: included upstream.
diff --git a/debian/changelog b/debian/changelog
index 3ada1df..2c28c66 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+vlc (2.2.3-1) UNRELEASED; urgency=medium
+
+ * New upstream release.
+ * debian/patches:
+ - Refresh fix-translation.patch: remove parts included upstream.
+ - Remove qt4-Fix-resume-where-you-left-off.patch,
+ qt4-input_manager-Always-reset-lastURI-when-stopping.patch,
+ avcodec-pass-consistent-dimensions-to-hardware-decod.patch: included upstream.
+
+ -- Mateusz Łukasik <mati75 at linuxmint.pl> Fri, 29 Apr 2016 08:45:23 +0200
+
vlc (2.2.2-6) unstable; urgency=medium
* Use embedded copy of ffmpeg 2.8.6. (Closes: #803868)
diff --git a/debian/patches/avcodec-pass-consistent-dimensions-to-hardware-decod.patch b/debian/patches/avcodec-pass-consistent-dimensions-to-hardware-decod.patch
deleted file mode 100644
index 58ced9d..0000000
--- a/debian/patches/avcodec-pass-consistent-dimensions-to-hardware-decod.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From bdd50cc0d7c316d123974ca9ae35c02f550fdc35 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <remid at nvidia.com>
-Date: Mon, 22 Feb 2016 07:17:23 +0200
-Subject: [PATCH 23/60] avcodec: pass consistent dimensions to hardware decoder
-
-Commit 01c4f44e88bfbb8ecf108c0fe40f3797bddac686 fixed one call site of
-vlc_va_Setup() but left the other one silently broken. This should fix
-decoding with libvdpau-va-gl (untested).
-
-The original regression was introduced by
-commit b71c85b3d88b8d0ad2d4a63bf58ebcd2ad771cbf.
----
- modules/codec/avcodec/video.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/modules/codec/avcodec/video.c b/modules/codec/avcodec/video.c
-index 0ecd7fe..c115db9 100644
---- a/modules/codec/avcodec/video.c
-+++ b/modules/codec/avcodec/video.c
-@@ -1359,10 +1359,10 @@ static enum PixelFormat ffmpeg_GetFormat( AVCodecContext *p_context,
-
- /* We try to call vlc_va_Setup when possible to detect errors when
- * possible (later is too late) */
-- if( p_context->width > 0 && p_context->height > 0
-+ if( p_context->coded_width > 0 && p_context->coded_height > 0
- && vlc_va_Setup( p_va, &p_context->hwaccel_context,
- &p_dec->fmt_out.video.i_chroma,
-- p_context->width, p_context->height ) )
-+ p_context->coded_width, p_context->coded_height ) )
- {
- msg_Err( p_dec, "acceleration setup failure" );
- break;
---
-2.7.0
-
diff --git a/debian/patches/fix-translation.patch b/debian/patches/fix-translation.patch
index 4d8037f..c92d809 100644
--- a/debian/patches/fix-translation.patch
+++ b/debian/patches/fix-translation.patch
@@ -2,35 +2,6 @@ Description: Revert invalid translations
Bug: https://trac.videolan.org/vlc/ticket/16598
Bug-Debian: https://bugs.debian.org/814258
---- a/po/de.po
-+++ b/po/de.po
-@@ -22012,7 +22012,7 @@
-
- #: modules/gui/qt4/menus.cpp:491
- msgid "Ctrl+L"
--msgstr "Strg+L"
-+msgstr "Ctrl+L"
-
- #: modules/gui/qt4/menus.cpp:494
- msgid "Docked Playlist"
-@@ -22024,7 +22024,7 @@
-
- #: modules/gui/qt4/menus.cpp:506
- msgid "Ctrl+H"
--msgstr "Strg+H"
-+msgstr "Ctrl+H"
-
- #: modules/gui/qt4/menus.cpp:515
- msgid "&Fullscreen Interface"
-@@ -22180,7 +22180,7 @@
-
- #: modules/gui/qt4/menus.cpp:918
- msgid "Ctrl+T"
--msgstr "Strg+T"
-+msgstr "Ctrl+T"
-
- #: modules/gui/qt4/menus.cpp:933
- msgid "Open &Network..."
--- a/po/mr.po
+++ b/po/mr.po
@@ -21567,7 +21567,7 @@
diff --git a/debian/patches/qt4-Fix-resume-where-you-left-off.patch b/debian/patches/qt4-Fix-resume-where-you-left-off.patch
deleted file mode 100644
index 00ed795..0000000
--- a/debian/patches/qt4-Fix-resume-where-you-left-off.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From f44922c97b20d1978623766b15a73675777f5323 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Hugo=20Beauz=C3=A9e-Luyssen?= <hugo at beauzee.fr>
-Date: Tue, 16 Feb 2016 17:20:03 +0100
-Subject: [PATCH 19/60] qt4: Fix "resume where you left off"
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-fix #16593
-
-(cherry picked from commit 60399fdf58f7ad61c6e561e0f81cb736cb5413b0)
-Signed-off-by: Hugo Beauzée-Luyssen <hugo at beauzee.fr>
----
- modules/gui/qt4/input_manager.cpp | 29 ++++++++++++++---------------
- 1 file changed, 14 insertions(+), 15 deletions(-)
-
-diff --git a/modules/gui/qt4/input_manager.cpp b/modules/gui/qt4/input_manager.cpp
-index 707f114..6734bfd 100644
---- a/modules/gui/qt4/input_manager.cpp
-+++ b/modules/gui/qt4/input_manager.cpp
-@@ -127,11 +127,11 @@ void InputManager::setInput( input_thread_t *_p_input )
- p_item = input_GetItem( p_input );
- emit rateChanged( var_GetFloat( p_input, "rate" ) );
-
-- char *uri = input_item_GetURI( p_item );
--
- /* Get Saved Time */
- if( p_item->i_type == ITEM_TYPE_FILE )
- {
-+ char *uri = input_item_GetURI( p_item );
-+
- int i_time = RecentsMRL::getInstance( p_intf )->time( qfu(uri) );
- if( i_time > 0 && qfu( uri ) != lastURI &&
- !var_GetFloat( p_input, "run-time" ) &&
-@@ -140,20 +140,19 @@ void InputManager::setInput( input_thread_t *_p_input )
- {
- emit resumePlayback( (int64_t)i_time * 1000 );
- }
-+ playlist_Lock( THEPL );
-+ // Add root items only
-+ playlist_item_t* p_node = playlist_CurrentPlayingItem( THEPL );
-+ if ( p_node != NULL && ( p_node->p_parent == NULL || p_node->i_children == -1 ) )
-+ {
-+ // Save the latest URI to avoid asking to restore the
-+ // position on the same input file.
-+ lastURI = qfu( uri );
-+ RecentsMRL::getInstance( p_intf )->addRecent( lastURI );
-+ }
-+ playlist_Unlock( THEPL );
-+ free( uri );
- }
--
-- playlist_Lock( THEPL );
-- // Add root items only
-- playlist_item_t* p_node = playlist_CurrentPlayingItem( THEPL );
-- if ( p_node != NULL && p_node->p_parent == NULL )
-- {
-- // Save the latest URI to avoid asking to restore the
-- // position on the same input file.
-- lastURI = qfu( uri );
-- RecentsMRL::getInstance( p_intf )->addRecent( lastURI );
-- }
-- playlist_Unlock( THEPL );
-- free( uri );
- }
- else
- {
---
-2.7.0
-
diff --git a/debian/patches/qt4-input_manager-Always-reset-lastURI-when-stopping.patch b/debian/patches/qt4-input_manager-Always-reset-lastURI-when-stopping.patch
deleted file mode 100644
index 36a3f2e..0000000
--- a/debian/patches/qt4-input_manager-Always-reset-lastURI-when-stopping.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 748b744594dbbdc0ec52149c2b6c4b3aca0a22c4 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Hugo=20Beauz=C3=A9e-Luyssen?= <hugo at beauzee.fr>
-Date: Thu, 18 Feb 2016 18:12:43 +0100
-Subject: [PATCH 20/60] qt4: input_manager: Always reset lastURI when stopping
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This allow the resume where you left off feature to kick in when
-starting the playback again, but not when cycling through a playlist
-refs #11704
-
-(cherry picked from commit 285a3efcbb4f64ea4d9812d1f94605cef7c65083)
-Signed-off-by: Hugo Beauzée-Luyssen <hugo at beauzee.fr>
----
- modules/gui/qt4/input_manager.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/modules/gui/qt4/input_manager.cpp b/modules/gui/qt4/input_manager.cpp
-index 6734bfd..89f8ba4 100644
---- a/modules/gui/qt4/input_manager.cpp
-+++ b/modules/gui/qt4/input_manager.cpp
-@@ -157,6 +157,7 @@ void InputManager::setInput( input_thread_t *_p_input )
- else
- {
- p_item = NULL;
-+ lastURI.clear();
- assert( !p_input_vbi );
- emit rateChanged( var_InheritFloat( p_intf, "rate" ) );
- }
-@@ -1122,7 +1123,6 @@ void MainInputManager::probeCurrentInput()
- void MainInputManager::stop()
- {
- playlist_Stop( THEPL );
-- getIM()->lastURI.clear();
- }
-
- void MainInputManager::next()
---
-2.7.0
-
diff --git a/debian/patches/series b/debian/patches/series
index 167a235..6b3c93e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,3 @@
frenchtv-links.patch
zsh-completion.patch
fix-translation.patch
-qt4-Fix-resume-where-you-left-off.patch
-qt4-input_manager-Always-reset-lastURI-when-stopping.patch
-avcodec-pass-consistent-dimensions-to-hardware-decod.patch
--
VLC media player packaging
More information about the pkg-multimedia-commits
mailing list