commit eb00126a6179cb29cb4d7b34d2034b6badab43fb
Author: Jan Rękorajski <[email protected]>
Date: Sun Apr 29 01:49:33 2018 +0200
- fix building with ffmpeg 4.0
- rel 4
DirectFB.spec | 4 +++-
ffmpeg4.patch | 22 ++++++++++++++++++++++
2 files changed, 25 insertions(+), 1 deletion(-)
---
diff --git a/DirectFB.spec b/DirectFB.spec
index aad4c82..d8e2a22 100644
--- a/DirectFB.spec
+++ b/DirectFB.spec
@@ -25,7 +25,7 @@ Summary: DirectFB - Hardware graphics acceleration
Summary(pl.UTF-8): DirectFB - Wspomaganie grafiki
Name: DirectFB
Version: 1.7.7
-Release: 3
+Release: 4
Epoch: 1
License: LGPL v2+
Group: Libraries
@@ -52,6 +52,7 @@ Patch12: x32-asm.patch
Patch13: ffmpeg3.patch
Patch14: %{name}-tslib.patch
Patch15: %{name}-libtimidity.patch
+Patch16: ffmpeg4.patch
URL: http://www.directfb.net/
BuildRequires: Mesa-libEGL-devel
BuildRequires: Mesa-libGLES-devel
@@ -949,6 +950,7 @@ Statyczna biblioteka sawman.
%patch13 -p1
%patch14 -p1
%patch15 -p1
+%patch16 -p1
# video drivers
%{__sed} -i -e
's/checkfor_\(cle266\|cyber5k\|radeon\|savage\|unichrome\|vmware\)=no/checkfor_\1=yes/'
configure.in
diff --git a/ffmpeg4.patch b/ffmpeg4.patch
new file mode 100644
index 0000000..386b430
--- /dev/null
+++ b/ffmpeg4.patch
@@ -0,0 +1,22 @@
+---
DirectFB-1.7.7/interfaces/IDirectFBImageProvider/idirectfbimageprovider_ffmpeg.c~
++++
DirectFB-1.7.7/interfaces/IDirectFBImageProvider/idirectfbimageprovider_ffmpeg.c
+@@ -300,7 +300,7 @@ IDirectFBImageProvider_FFMPEG_RenderTo(
IDirectFBImageProvider *thiz,
+ av_pkt.data = comp_data_buffer;
+
+ /*We don't pass complete frames*/
+- av_codec_ctx->flags |= CODEC_FLAG_TRUNCATED;
++ av_codec_ctx->flags |= AV_CODEC_FLAG_TRUNCATED;
+
+ do
+ {
+---
DirectFB-1.7.7/interfaces/IDirectFBVideoProvider/idirectfbvideoprovider_ffmpeg.c~
2018-04-29 01:34:51.000000000 +0200
++++
DirectFB-1.7.7/interfaces/IDirectFBVideoProvider/idirectfbvideoprovider_ffmpeg.c
2018-04-29 01:44:29.654235050 +0200
+@@ -549,7 +549,7 @@
+ }
+
+ if (av_read_frame( data->context, &packet ) < 0) {
+- if (url_feof( data->context->pb )) {
++ if (avio_feof( data->context->pb )) {
+ if (data->input.buffering) {
+ pthread_mutex_unlock( &data->audio.queue.lock );
+ pthread_mutex_unlock( &data->video.queue.lock );
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/DirectFB.git/commitdiff/eb00126a6179cb29cb4d7b34d2034b6badab43fb
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
