[patch] vlc-2.1.0-on-the-way-to-2.1.1.patch

vlc-2.1.1-on-the-way-to.patch (text/plain), 18.72 KB, created by Ulenrich on 2013-10-01 12:24:41 UTC

From f579169e8c2818e8673e5fc8389910490f9bac57 Mon Sep 17 00:00:00 2001
From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= <[e-mail]>
Date: Mon, 27 May 2013 18:58:40 +0300
Subject: [PATCH] po: correct Qt4 Ctrl+{H,L} translations

(This should maybe not be marked for translation at all. Only Russian
defines it to something different than Ctrl+{H,L}.)

Adding whitespaces or translating "Ctrl" breaks Qt4 internals.

(cherry picked from commit feb479f20dcceb92aaf02bb839d8a1088e05f83a)
(cherry picked from commit 241b81a725b7c092bbcbd4a8a192da1bfe026977)
---
 po/de.po |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/po/de.po b/po/de.po
index 63f07a4..a7a4b51 100644
--- a/po/de.po
+++ b/po/de.po
@@ -21728,7 +21728,7 @@ msgstr "Wiedergabeliste"
 
 #: modules/gui/qt4/menus.cpp:482
 msgid "Ctrl+L"
-msgstr "Strg+L"
+msgstr "Ctrl+L"
 
 #: modules/gui/qt4/menus.cpp:485
 msgid "Docked Playlist"
@@ -21740,7 +21740,7 @@ msgstr "Mi&nimale Ansicht"
 
 #: modules/gui/qt4/menus.cpp:497
 msgid "Ctrl+H"
-msgstr "Strg+H"
+msgstr "Ctrl+H"
 
 #: modules/gui/qt4/menus.cpp:506
 msgid "&Fullscreen Interface"
-- 
1.7.10.4

From 13dd9b67cb6a99aa511fdc6da0cdf4448aa50ed0 Mon Sep 17 00:00:00 2001
From: Francois Cartegnie <[e-mail]>
Date: Sat, 28 Sep 2013 02:00:11 +0200
Subject: [PATCH] muxers: ogg: set invalid granulepos value (fix #8725)

(cherry picked from commit 7202a56a86b2f7d3c8c4d969a4db719427e25ca3)
Signed-off-by: Jean-Baptiste Kempf <[e-mail]>
---
 modules/mux/ogg.c |    1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/mux/ogg.c b/modules/mux/ogg.c
index 99252b0..c43aecb 100644
--- a/modules/mux/ogg.c
+++ b/modules/mux/ogg.c
@@ -989,6 +989,7 @@ static int MuxBlock( sout_mux_t *p_mux, sout_input_t *p_input )
     op.b_o_s    = 0;
     op.e_o_s    = 0;
     op.packetno = p_stream->i_packet_no++;
+    op.granulepos = -1;
 
     if( p_stream->i_cat == AUDIO_ES )
     {
-- 
1.7.10.4

From e64801b6bc6e85030fc447d52908e54da6c0d1c2 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Kempf <[e-mail]>
Date: Sat, 28 Sep 2013 20:58:55 +0200
Subject: [PATCH] Qt4: correctly save the keys, indepententy from the locale

(cherry picked from commit 2d37a070d7a92f15fb3d0aa60365593622f92beb)
Signed-off-by: Jean-Baptiste Kempf <[e-mail]>
---
 modules/gui/qt4/components/preferences_widgets.cpp |   14 +++++++-------
 modules/gui/qt4/util/customwidgets.cpp             |    4 ++--
 modules/gui/qt4/util/customwidgets.hpp             |    2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/modules/gui/qt4/components/preferences_widgets.cpp b/modules/gui/qt4/components/preferences_widgets.cpp
index 1bf57c2..8af40af 100644
--- a/modules/gui/qt4/components/preferences_widgets.cpp
+++ b/modules/gui/qt4/components/preferences_widgets.cpp
@@ -1228,11 +1228,11 @@ void KeySelectorControl::finish()
             treeItem->setData( ACTION_COL, Qt::UserRole,
                                QVariant( qfu( p_config_item->psz_name ) ) );
 
-            QString keys = qfu( p_config_item->value.psz );
+            QString keys = qfu(p_config_item->value.psz ? _(p_config_item->value.psz) : "");
             treeItem->setText( HOTKEY_COL, keys );
             treeItem->setToolTip( HOTKEY_COL, qtr("Double click to change.\nDelete key to remove.") );
             treeItem->setToolTip( GLOBAL_HOTKEY_COL, qtr("Double click to change.\nDelete key to remove.") );
-            treeItem->setData( HOTKEY_COL, Qt::UserRole, QVariant( keys ) );
+            treeItem->setData( HOTKEY_COL, Qt::UserRole, QVariant( p_config_item->value.psz ) );
             table->addTopLevelItem( treeItem );
             continue;
         }
@@ -1313,7 +1313,7 @@ void KeySelectorControl::selectKey( QTreeWidgetItem *keyItem, int column )
 
     if( d->result() == QDialog::Accepted )
     {
-        QString newKey = VLCKeyToString( d->keyValue );
+        QString newKey = VLCKeyToString( d->keyValue, false );
 
         /* In case of conflict, reset other keys*/
         if( d->conflicts )
@@ -1331,7 +1331,7 @@ void KeySelectorControl::selectKey( QTreeWidgetItem *keyItem, int column )
             }
         }
 
-        keyItem->setText( column, newKey );
+        keyItem->setText( column, VLCKeyToString( d->keyValue, true ) );
         keyItem->setData( column, Qt::UserRole, newKey );
     }
     else if( d->result() == 2 )
@@ -1448,7 +1448,7 @@ void KeyInputDialog::setExistingkeysSet( const QSet<QString> *keyset )
 void KeyInputDialog::checkForConflicts( int i_vlckey, const QString &sequence )
 {
     QList<QTreeWidgetItem *> conflictList =
-        table->findItems( VLCKeyToString( i_vlckey ), Qt::MatchExactly,
+        table->findItems( VLCKeyToString( i_vlckey, true ), Qt::MatchExactly,
                           b_global ? 2 : 1 );
 
     if( conflictList.count() &&
@@ -1491,7 +1491,7 @@ void KeyInputDialog::keyPressEvent( QKeyEvent *e )
     int i_vlck = qtEventToVLCKey( e );
     QKeySequence sequence( e->key() | e->modifiers() );
     selected->setText( qtr( "Key or combination: " )
-                + QString("<b>%1</b>").arg( VLCKeyToString( i_vlck ) ) );
+                + QString("<b>%1</b>").arg( VLCKeyToString( i_vlck, true ) ) );
     checkForConflicts( i_vlck, sequence.toString() );
     keyValue = i_vlck;
 }
@@ -1499,7 +1499,7 @@ void KeyInputDialog::keyPressEvent( QKeyEvent *e )
 void KeyInputDialog::wheelEvent( QWheelEvent *e )
 {
     int i_vlck = qtWheelEventToVLCKey( e );
-    selected->setText( qtr( "Key: " ) + VLCKeyToString( i_vlck ) );
+    selected->setText( qtr( "Key: " ) + VLCKeyToString( i_vlck, true ) );
     checkForConflicts( i_vlck, QString() );
     keyValue = i_vlck;
 }
diff --git a/modules/gui/qt4/util/customwidgets.cpp b/modules/gui/qt4/util/customwidgets.cpp
index 1a00fe0..775218b 100644
--- a/modules/gui/qt4/util/customwidgets.cpp
+++ b/modules/gui/qt4/util/customwidgets.cpp
@@ -287,9 +287,9 @@ int qtWheelEventToVLCKey( QWheelEvent *e )
     return i_vlck;
 }
 
-QString VLCKeyToString( unsigned val )
+QString VLCKeyToString( unsigned val, bool locale )
 {
-    char *base = vlc_keycode2str (val, true);
+    char *base = vlc_keycode2str (val, locale);
     if (base == NULL)
         return qtr( "Unset" );
 
diff --git a/modules/gui/qt4/util/customwidgets.hpp b/modules/gui/qt4/util/customwidgets.hpp
index e7ccf46..37fce1d 100644
--- a/modules/gui/qt4/util/customwidgets.hpp
+++ b/modules/gui/qt4/util/customwidgets.hpp
@@ -167,6 +167,6 @@ class QInputEvent;
 int qtKeyModifiersToVLC( QInputEvent* e );
 int qtEventToVLCKey( QKeyEvent *e );
 int qtWheelEventToVLCKey( QWheelEvent *e );
-QString VLCKeyToString( unsigned val );
+QString VLCKeyToString( unsigned val, bool );
 
 #endif
-- 
1.7.10.4

From 4c8e7344a8aef6cd34fe7c64c4f55ef3b1016f21 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Kempf <[e-mail]>
Date: Sat, 28 Sep 2013 21:07:57 +0200
Subject: [PATCH] Qt: fix volume alignment in native look

As reported on Reddit

(cherry picked from commit 586296da6062c40ed7b5644080b8cf80451b3b28)
Signed-off-by: Jean-Baptiste Kempf <[e-mail]>
---
 modules/gui/qt4/components/controller_widget.cpp |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/gui/qt4/components/controller_widget.cpp b/modules/gui/qt4/components/controller_widget.cpp
index 1b3f478..aad30a2 100644
--- a/modules/gui/qt4/components/controller_widget.cpp
+++ b/modules/gui/qt4/components/controller_widget.cpp
@@ -64,7 +64,7 @@ SoundWidget::SoundWidget( QWidget *_parent, intf_thread_t * _p_intf,
         volumeControlWidget = NULL;
 
         /* And add the label */
-        layout->addWidget( volMuteLabel, 0, Qt::AlignBottom );
+        layout->addWidget( volMuteLabel, 0, b_shiny? Qt::AlignBottom : Qt::AlignCenter );
     }
     else
     {
@@ -105,7 +105,7 @@ SoundWidget::SoundWidget( QWidget *_parent, intf_thread_t * _p_intf,
     if( b_special )
         subLayout->addWidget( volumeSlider );
     else
-        layout->addWidget( volumeSlider, 0, Qt::AlignBottom  );
+        layout->addWidget( volumeSlider, 0, b_shiny? Qt::AlignBottom : Qt::AlignCenter );
 
     /* Set the volume from the config */
     float volume = playlist_VolumeGet( THEPL );
-- 
1.7.10.4

From 31df15fbbee73dcf51ff63451064205a03c99bd8 Mon Sep 17 00:00:00 2001
From: Ilkka Ollakka <[e-mail]>
Date: Sun, 29 Sep 2013 14:26:59 +0300
Subject: [PATCH] avcodec: check/update buffered_time earlier, so we shouldn't
 use 0 as time when encoding

Ref #9022
(cherry picked from commit 5a43b77365cb65ea8a28e3db2d0b9f3cdcee7191)

Signed-off-by: Ilkka Ollakka <[e-mail]>
---
 modules/codec/avcodec/encoder.c |   14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/modules/codec/avcodec/encoder.c b/modules/codec/avcodec/encoder.c
index a82d235..be473bf 100644
--- a/modules/codec/avcodec/encoder.c
+++ b/modules/codec/avcodec/encoder.c
@@ -1149,12 +1149,17 @@ static block_t *EncodeAudio( encoder_t *p_enc, block_t *p_aout_buf )
         AVPacket packet = {0};
         avcodec_get_frame_defaults( p_sys->frame );
         p_sys->frame->format     = p_sys->p_context->sample_fmt;
-        p_sys->frame->pts        = date_Get( &p_sys->buffer_date );
         p_sys->frame->nb_samples = leftover_samples + p_sys->i_samples_delay;
-        date_Increment( &p_sys->buffer_date, p_sys->i_frame_size );
 
+        if( unlikely( p_aout_buf && ( p_aout_buf->i_pts > VLC_TS_INVALID ) &&
+            (p_aout_buf->i_pts != date_Get( &p_sys->buffer_date ) ) ) )
+            date_Set( &p_sys->buffer_date, p_aout_buf->i_pts );
+
+        p_sys->frame->pts        = date_Get( &p_sys->buffer_date );
+        date_Increment( &p_sys->buffer_date, p_sys->i_frame_size );
         if( likely( p_aout_buf ) )
         {
+
             p_aout_buf->i_nb_samples -= leftover_samples;
             memcpy( p_sys->p_buffer+buffer_delay, p_aout_buf->p_buffer, leftover );
 
@@ -1169,6 +1174,7 @@ static block_t *EncodeAudio( encoder_t *p_enc, block_t *p_aout_buf )
             p_aout_buf->i_buffer     -= leftover;
             p_aout_buf->i_pts         = date_Get( &p_sys->buffer_date );
         }
+
         if(unlikely( ( (leftover + buffer_delay) < p_sys->i_buffer_out ) &&
                      !(p_sys->p_codec->capabilities & CODEC_CAP_SMALL_LAST_FRAME ))
           )
@@ -1254,10 +1260,6 @@ static block_t *EncodeAudio( encoder_t *p_enc, block_t *p_aout_buf )
         const int align = 1;
 #endif
 
-        if( unlikely( p_aout_buf->i_pts > VLC_TS_INVALID &&
-                      p_aout_buf->i_pts != date_Get( &p_sys->buffer_date ) ) )
-            date_Set( &p_sys->buffer_date, p_aout_buf->i_pts );
-
         avcodec_get_frame_defaults( p_sys->frame );
         if( p_sys->b_variable )
             p_sys->frame->nb_samples = p_aout_buf->i_nb_samples;
-- 
1.7.10.4

From 1bbf0e468419744a382b6d4df02aa49c3cb153f1 Mon Sep 17 00:00:00 2001
From: Ilkka Ollakka <[e-mail]>
Date: Sun, 29 Sep 2013 11:41:08 +0300
Subject: [PATCH] transcode: don't check drift if we have VLC_TS_INVALID pts
 (cherry picked from commit
 af762f811d4ed34a883bc2003f4c70e18f66965e)

Signed-off-by: Ilkka Ollakka <[e-mail]>
---
 modules/stream_out/transcode/audio.c |   12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/modules/stream_out/transcode/audio.c b/modules/stream_out/transcode/audio.c
index 6d5ccb3..8d3ee57 100644
--- a/modules/stream_out/transcode/audio.c
+++ b/modules/stream_out/transcode/audio.c
@@ -216,8 +216,13 @@ int transcode_audio_process( sout_stream_t *p_stream,
         if( p_sys->b_master_sync )
         {
             mtime_t i_pts = date_Get( &id->interpolated_pts ) + 1;
-            mtime_t i_drift = p_audio_buf->i_pts - i_pts;
-            if (i_drift > MASTER_SYNC_MAX_DRIFT || i_drift < -MASTER_SYNC_MAX_DRIFT)
+            mtime_t i_drift = 0;
+
+            if( likely( p_audio_buf->i_pts != VLC_TS_INVALID ) )
+                i_drift = p_audio_buf->i_pts - i_pts;
+
+            if ( unlikely(i_drift > MASTER_SYNC_MAX_DRIFT
+                 || i_drift < -MASTER_SYNC_MAX_DRIFT) )
             {
                 msg_Dbg( p_stream,
                     "drift is too high (%"PRId64"), resetting master sync",
@@ -225,7 +230,8 @@ int transcode_audio_process( sout_stream_t *p_stream,
                 date_Set( &id->interpolated_pts, p_audio_buf->i_pts );
                 i_pts = p_audio_buf->i_pts + 1;
             }
-            p_sys->i_master_drift = p_audio_buf->i_pts - i_pts;
+            if( likely(p_audio_buf->i_pts != VLC_TS_INVALID ) )
+                p_sys->i_master_drift = p_audio_buf->i_pts - i_pts;
             date_Increment( &id->interpolated_pts, p_audio_buf->i_nb_samples );
             p_audio_buf->i_pts = i_pts;
         }
-- 
1.7.10.4

From c109c1950ae65c9f6ec3eef48cc900f4e866e3b5 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Kempf <[e-mail]>
Date: Sun, 29 Sep 2013 22:47:08 +0200
Subject: [PATCH] HTTP interface: fix infinite loop

(cherry picked from commit 5f58853765d3891c9fe7c12b13525ab071eac1eb)
Signed-off-by: Jean-Baptiste Kempf <[e-mail]>
---
 share/lua/intf/modules/httprequests.lua |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/share/lua/intf/modules/httprequests.lua b/share/lua/intf/modules/httprequests.lua
index 33be631..444f89d 100644
--- a/share/lua/intf/modules/httprequests.lua
+++ b/share/lua/intf/modules/httprequests.lua
@@ -52,7 +52,6 @@ function strsplit(text, delimiter)
     end
     local i=1
     while 1 do
-        i=i+1
         local first, last = strfind(text, delimiter, pos)
         if first then -- found?
             tinsert(list,i, strsub(text, pos, first-1))
@@ -61,6 +60,7 @@ function strsplit(text, delimiter)
             tinsert(list,i, strsub(text, pos))
             break
         end
+        i = i+1
     end
     return list
 end
-- 
1.7.10.4

From dbf4195068d2febd851caa4aaa1005e28bf88c1e Mon Sep 17 00:00:00 2001
From: =?utf8?q?Felix=20Paul=20K=C3=BChne?= <[e-mail]>
Date: Mon, 30 Sep 2013 09:43:32 +0200
Subject: [PATCH] configure.ac: remove unused MACOSX_DEPLOYMENT_TARGET macro
 (close #9139)

(cherry picked from commit 23a221fafbef15a7ed3b6072f8e74481e5d8b966)
---
 configure.ac |    5 -----
 1 file changed, 5 deletions(-)

diff --git a/configure.ac b/configure.ac
index 0e00b12..32b774f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -189,16 +189,11 @@ case "${host_os}" in
       [AS_HELP_STRING([--with-macosx-version-min=VERSION],
         [compile for Mac OS X VERSION and above])])
     if test "${with_macosx_version_min}" != "" ; then
-        MACOSX_DEPLOYMENT_TARGET=${with_macosx_version_min}
         CPP="${CPP} -mmacosx-version-min=${with_macosx_version_min}"
         CC="${CC} -mmacosx-version-min=${with_macosx_version_min}"
         CXX="${CXX} -mmacosx-version-min=${with_macosx_version_min}"
         OBJC="${OBJC} -mmacosx-version-min=${with_macosx_version_min}"
         LD="${LD} -mmacosx_version_min=${with_macosx_version_min}"
-        CFLAGS="${CFLAGS} -DMACOSX_DEPLOYMENT_TARGET=${with_macosx_version_min}"
-        CXXFLAGS="${CXXFLAGS} -DMACOSX_DEPLOYMENT_TARGET=${with_macosx_version_min}"
-        OBJCFLAGS="${OBJCFLAGS} -DMACOSX_DEPLOYMENT_TARGET=${with_macosx_version_min}"
-        export MACOSX_DEPLOYMENT_TARGET
     fi
     ;;
   *mingw32* | *cygwin* | *wince* | *mingwce*)
-- 
1.7.10.4

From 4781fee9197d482a31f18ae6dfd3c2776585657e Mon Sep 17 00:00:00 2001
From: =?utf8?q?Felix=20Paul=20K=C3=BChne?= <[e-mail]>
Date: Thu, 8 Aug 2013 21:41:46 +0200
Subject: [PATCH] contrib/zvbi: fix compilation with clang

Simplified version of initial patch

(cherry picked from commit 568ddf541776fb84e19dbd23fb900a1f6248f0b5)
---
 contrib/src/zvbi/rules.mak                    |    3 +++
 contrib/src/zvbi/zvbi-fix-clang-support.patch |   30 +++++++++++++++++++++++++
 2 files changed, 33 insertions(+)
 create mode 100644 contrib/src/zvbi/zvbi-fix-clang-support.patch

diff --git a/contrib/src/zvbi/rules.mak b/contrib/src/zvbi/rules.mak
index a9e0cd2..345f9d8 100644
--- a/contrib/src/zvbi/rules.mak
+++ b/contrib/src/zvbi/rules.mak
@@ -20,6 +20,9 @@ zvbi: zvbi-$(ZVBI_VERSION).tar.bz2 .sum-zvbi
 ifdef HAVE_WIN32
 	$(APPLY) $(SRC)/zvbi/zvbi-win32.patch
 endif
+ifdef HAVE_DARWIN_OS
+	$(APPLY) $(SRC)/zvbi/zvbi-fix-clang-support.patch
+endif
 	$(MOVE)
 
 DEPS_zvbi = pthreads iconv $(DEPS_iconv)
diff --git a/contrib/src/zvbi/zvbi-fix-clang-support.patch b/contrib/src/zvbi/zvbi-fix-clang-support.patch
new file mode 100644
index 0000000..ca83c55
--- /dev/null
+++ b/contrib/src/zvbi/zvbi-fix-clang-support.patch
@@ -0,0 +1,30 @@
+diff -ru zvbi/src/misc.h zvbi-fixed/src/misc.h
+--- zvbi/src/misc.h	2013-07-02 04:32:31.000000000 +0200
++++ zvbi-fixed/src/misc.h	2013-08-08 21:37:22.000000000 +0200
+@@ -52,17 +52,6 @@
+ #  define unlikely(expr) __builtin_expect(expr, 0)
+ #endif
+ 
+-#undef __i386__
+-#undef __i686__
+-/* FIXME #cpu is deprecated
+-#if #cpu (i386)
+-#  define __i386__ 1
+-#endif
+-#if #cpu (i686)
+-#  define __i686__ 1
+-#endif
+-*/
+-
+ /* &x == PARENT (&x.tm_min, struct tm, tm_min),
+    safer than &x == (struct tm *) &x.tm_min. A NULL _ptr is safe and
+    will return NULL, not -offsetof(_member). */
+@@ -156,8 +145,6 @@
+ 
+ #define likely(expr) (expr)
+ #define unlikely(expr) (expr)
+-#undef __i386__
+-#undef __i686__
+ 
+ static char *
+ PARENT_HELPER (char *p, unsigned int offset)
-- 
1.7.10.4

From 79a0196b415c4174d018b242fb56098b6b07d638 Mon Sep 17 00:00:00 2001
From: Denis Charmet <[e-mail]>
Date: Mon, 30 Sep 2013 14:54:37 +0200
Subject: [PATCH] Correctly check the index in the pref. list when selecting
 the ES.

The former check wasn't enough since a language that isn't in the table
has a -1 index.

Fix #9531
---
 src/input/es_out.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/input/es_out.c b/src/input/es_out.c
index 6b0e9ad..c75c6db 100644
--- a/src/input/es_out.c
+++ b/src/input/es_out.c
@@ -1772,7 +1772,7 @@ static void EsOutSelect( es_out_t *out, es_out_id_t *es, bool b_force )
                         LanguageArrayIndex( p_sys->ppsz_audio_language,
                                             p_sys->p_es_audio->psz_language_code );
                     if( es_idx >= 0 &&
-                        ( es_idx < selected_es_idx ||
+                        ( selected_es_idx < 0 || es_idx < selected_es_idx ||
                           ( es_idx == selected_es_idx &&
                             p_sys->p_es_audio->fmt.i_priority < es->fmt.i_priority ) ) )
                         i_wanted = es->i_channel;
@@ -1823,7 +1823,7 @@ static void EsOutSelect( es_out_t *out, es_out_id_t *es, bool b_force )
                                             p_sys->p_es_sub->psz_language_code );
 
                     if( es_idx >= 0 &&
-                        ( es_idx < selected_es_idx ||
+                        ( selected_es_idx < 0 || es_idx < selected_es_idx ||
                           ( es_idx == selected_es_idx &&
                             p_sys->p_es_sub->fmt.i_priority < es->fmt.i_priority ) ) )
                         i_wanted = es->i_channel;
-- 
1.7.10.4