From 6b8ab24a8b960432f5639f739f020a7d570173f42f9e1a5672e6466972de87a9 Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Wed, 20 Jan 2016 21:33:40 +0000 Subject: [PATCH] Accepting request 355075 from home:alois:branches:multimedia:apps Backported patch to fix problem with smplayer. OBS-URL: https://build.opensuse.org/request/show/355075 OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/mpv?expand=0&rev=32 --- mpv-0.15.0_fix_NULL_ptr.patch | 13 +++++++++++++ mpv.changes | 6 ++++++ mpv.spec | 2 ++ 3 files changed, 21 insertions(+) create mode 100644 mpv-0.15.0_fix_NULL_ptr.patch diff --git a/mpv-0.15.0_fix_NULL_ptr.patch b/mpv-0.15.0_fix_NULL_ptr.patch new file mode 100644 index 0000000..7a05580 --- /dev/null +++ b/mpv-0.15.0_fix_NULL_ptr.patch @@ -0,0 +1,13 @@ +Index: mpv-0.15.0/player/command.c +=================================================================== +--- mpv-0.15.0.orig/player/command.c ++++ mpv-0.15.0/player/command.c +@@ -2438,7 +2438,7 @@ static int mp_property_video_codec(void + { + MPContext *mpctx = ctx; + struct track *track = mpctx->current_track[0][STREAM_VIDEO]; +- const char *c = track->d_video ? track->d_video->decoder_desc : NULL; ++ const char *c = track && track->d_video ? track->d_video->decoder_desc : NULL; + return m_property_strdup_ro(action, arg, c); + } + diff --git a/mpv.changes b/mpv.changes index 971d046..aa63442 100644 --- a/mpv.changes +++ b/mpv.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jan 20 20:07:35 UTC 2016 - aloisio@gmx.com + +- Backported commit 5053f4c to fix hang problem with smplayer + (bug ref. #2729) + ------------------------------------------------------------------- Mon Jan 18 19:52:34 UTC 2016 - idonmez@suse.com diff --git a/mpv.spec b/mpv.spec index ed9ae31..c4c4450 100644 --- a/mpv.spec +++ b/mpv.spec @@ -34,6 +34,7 @@ Source: http://github.com/mpv-player/%{name}/archive/v%{version}.tar.gz# Source1: http://ftp.waf.io/pub/release/waf-%{_waf_ver} Source2: %{name}.changes Source3: %{name}.png +Patch0: %{name}-0.15.0_fix_NULL_ptr.patch BuildRequires: hicolor-icon-theme BuildRequires: ladspa-devel BuildRequires: libjpeg-devel @@ -145,6 +146,7 @@ features. %prep %setup -q +%patch0 -p1 # As we downloaded specific waf version we need to put and prepare it in place. cp -f %{SOURCE1} waf