From c93a9d37f1e84342e8ef992ecaffac99ab50993f Mon Sep 17 00:00:00 2001 From: bferturk Date: Mon, 13 Jun 2016 23:59:49 +0300 Subject: [PATCH 1/3] xine-lib --- .../xine-lib/files/xine-lib-ffmpeg3.patch | 55 +++++++++++++++++++ multimedia/video/xine-lib/pspec.xml | 3 +- 2 files changed, 57 insertions(+), 1 deletion(-) create mode 100644 multimedia/video/xine-lib/files/xine-lib-ffmpeg3.patch diff --git a/multimedia/video/xine-lib/files/xine-lib-ffmpeg3.patch b/multimedia/video/xine-lib/files/xine-lib-ffmpeg3.patch new file mode 100644 index 0000000000..f0cbc47488 --- /dev/null +++ b/multimedia/video/xine-lib/files/xine-lib-ffmpeg3.patch @@ -0,0 +1,55 @@ +Index: xine-lib-1.2.6/src/combined/ffmpeg/ff_audio_decoder.c +=================================================================== +--- xine-lib-1.2.6.orig/src/combined/ffmpeg/ff_audio_decoder.c ++++ xine-lib-1.2.6/src/combined/ffmpeg/ff_audio_decoder.c +@@ -590,7 +590,7 @@ static int ff_audio_decode (ff_audio_dec + int got_frame; + float gain = this->class->gain; + if (!this->av_frame) +- this->av_frame = avcodec_alloc_frame (); ++ this->av_frame = av_frame_alloc (); + + consumed = avcodec_decode_audio4 (this->context, this->av_frame, &got_frame, &avpkt); + if ((consumed >= 0) && got_frame) { +@@ -1071,7 +1071,7 @@ static void ff_audio_reset (audio_decode + /* try to reset the wma decoder */ + if( this->decoder_ok ) { + #if AVAUDIO > 3 +- avcodec_free_frame (&this->av_frame); ++ av_frame_free (&this->av_frame); + #endif + pthread_mutex_lock (&ffmpeg_lock); + avcodec_close (this->context); +@@ -1105,7 +1105,7 @@ static void ff_audio_dispose (audio_deco + + if( this->context && this->decoder_ok ) { + #if AVAUDIO > 3 +- avcodec_free_frame (&this->av_frame); ++ av_frame_free (&this->av_frame); + #endif + pthread_mutex_lock (&ffmpeg_lock); + avcodec_close (this->context); +Index: xine-lib-1.2.6/src/combined/ffmpeg/ff_video_decoder.c +=================================================================== +--- xine-lib-1.2.6.orig/src/combined/ffmpeg/ff_video_decoder.c ++++ xine-lib-1.2.6/src/combined/ffmpeg/ff_video_decoder.c +@@ -2523,7 +2523,7 @@ static video_decoder_t *ff_video_open_pl + this->stream = stream; + this->class = (ff_video_class_t *) class_gen; + +- this->av_frame = avcodec_alloc_frame(); ++ this->av_frame = av_frame_alloc(); + this->context = avcodec_alloc_context(); + this->context->opaque = this; + #if AVPALETTE == 1 +--- xine-lib-1.2.6/src/dxr3/ffmpeg_encoder.c.orig 2016-02-17 07:54:31.950881580 +0000 ++++ xine-lib-1.2.6/src/dxr3/ffmpeg_encoder.c 2016-02-17 07:55:42.897237494 +0000 +@@ -161,7 +161,7 @@ + "dxr3_mpeg_encoder: Couldn't start the ffmpeg library\n"); + return 0; + } +- this->picture = avcodec_alloc_frame(); ++ this->picture = av_frame_alloc(); + if (!this->picture) { + xprintf(drv->class->xine, XINE_VERBOSITY_LOG, + "dxr3_mpeg_encoder: Couldn't allocate ffmpeg frame\n"); diff --git a/multimedia/video/xine-lib/pspec.xml b/multimedia/video/xine-lib/pspec.xml index 89b7bd7d52..927555cec6 100644 --- a/multimedia/video/xine-lib/pspec.xml +++ b/multimedia/video/xine-lib/pspec.xml @@ -64,6 +64,7 @@ tr_segfault_fix.patch deepbind.patch lpthread.patch + xine-lib-ffmpeg3.patch @@ -136,7 +137,7 @@ - 2016-06-09 + 2016-06-13 1.2.6 Release Bump Pisi Linux Community From 33be1edeb5910de68097aea1a296a8456a148ef1 Mon Sep 17 00:00:00 2001 From: bferturk Date: Tue, 14 Jun 2016 00:17:58 +0300 Subject: [PATCH 2/3] mpv-player --- multimedia/video/mpv-player/pspec.xml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/multimedia/video/mpv-player/pspec.xml b/multimedia/video/mpv-player/pspec.xml index 1f28012ef2..76f8dc2ce8 100644 --- a/multimedia/video/mpv-player/pspec.xml +++ b/multimedia/video/mpv-player/pspec.xml @@ -12,7 +12,7 @@ app:gui mpv is based on mplayer2 mpv has Wayland support, Improved OpenGL output, Support for libavfilter (for video->video and audio->audio). This allows using most of FFmpeg's filters, which improve greatly on the old MPlayer filters in features, performance, and correctness.is a movie player that can run on many platforms. Improved OpenGL output. More correct color reproduction (color matrix generation), including support for BT.2020 (Ultra HD) and linear XYZ (Digital Cinema) inputs. - https://github.com/mpv-player/mpv/archive/v0.16.0.tar.gz + https://github.com/mpv-player/mpv/archive/v0.17.0.tar.gz ffmpeg-devel mesa-devel @@ -112,6 +112,13 @@ + + 2016-06-09 + 0.17.0 + Version Bump + Pisi Linux Community + admin@pisilinux.org + 2016-06-09 0.16.0 From 2be4fec6ccc7e74fa64e29c652e7194ab583c625 Mon Sep 17 00:00:00 2001 From: bferturk Date: Tue, 14 Jun 2016 00:18:38 +0300 Subject: [PATCH 3/3] mpv-player --- multimedia/video/mpv-player/pspec.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/multimedia/video/mpv-player/pspec.xml b/multimedia/video/mpv-player/pspec.xml index 76f8dc2ce8..3ad98de510 100644 --- a/multimedia/video/mpv-player/pspec.xml +++ b/multimedia/video/mpv-player/pspec.xml @@ -112,7 +112,7 @@ - + 2016-06-09 0.17.0 Version Bump