Attachment 177382 Details for Bug 214824 – workaround

[patch] workaround

gmerlin-avdecoder.novdpau.diff (text/plain), 3.02 KB, created by Jan Beich on 2016-11-25 12:32:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Beich

Created: 2016-11-25 12:32:11 UTC

Size: 3.02 KB

patch

obsolete

>From 9585a65826f4300fc0d75aaaef8050721b052896 Mon Sep 17 00:00:00 2001
>From: Jan Beich <jbeich@FreeBSD.org>
>Date: Fri, 25 Nov 2016 12:20:33 +0000
>Subject: multimedia/gmerlin-avdecoder: disable VDPAU by default
>
>video_ffmpeg.c:206:12: error: no member named 'type' in 'struct AVFrame'
>      pic->type = FF_BUFFER_TYPE_USER;
>      ~~~  ^
>video_ffmpeg.c:206:19: error: use of undeclared identifier 'FF_BUFFER_TYPE_USER'
>      pic->type = FF_BUFFER_TYPE_USER;
>                  ^
>video_ffmpeg.c:222:15: error: no member named 'reference' in 'struct AVFrame'
>      if(pic->reference)
>         ~~~  ^
>video_ffmpeg.c:278:10: error: returning 'const enum PixelFormat' from a function with incompatible
>      result type 'enum AVPixelFormat'
>  return *fmt;
>         ^~~~
>video_ffmpeg.c:788:14: error: no member named 'get_buffer' in 'struct AVCodecContext'; did you mean
>      'get_buffer2'?
>  priv->ctx->get_buffer      = vdpau_get_buffer;
>             ^~~~~~~~~~
>             get_buffer2
>/usr/local/include/libavcodec/avcodec.h:2593:11: note: 'get_buffer2' declared here
>    int (*get_buffer2)(struct AVCodecContext *s, AVFrame *frame, int flags);
>          ^
>video_ffmpeg.c:788:30: warning: incompatible pointer types assigning to 'int (*)(struct
>      AVCodecContext *, AVFrame *, int)' (aka 'int (*)(struct AVCodecContext *, struct AVFrame *,
>      int)') from 'int (struct AVCodecContext *, AVFrame *)' (aka 'int (struct AVCodecContext *,
>      struct AVFrame *)') [-Wincompatible-pointer-types]
>  priv->ctx->get_buffer      = vdpau_get_buffer;
>                             ^ ~~~~~~~~~~~~~~~~
>video_ffmpeg.c:789:14: error: no member named 'release_buffer' in 'struct AVCodecContext'
>  priv->ctx->release_buffer      = vdpau_release_buffer;
>  ~~~~~~~~~  ^
>
>PR:		214824
>Approved by:	wg (maintainer)
>---
> multimedia/gmerlin-avdecoder/Makefile | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
>diff --git a/multimedia/gmerlin-avdecoder/Makefile b/multimedia/gmerlin-avdecoder/Makefile
>index 83b463d..c3428bd 100644
>--- a/multimedia/gmerlin-avdecoder/Makefile
>+++ b/multimedia/gmerlin-avdecoder/Makefile
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	gmerlin-avdecoder
> PORTVERSION=	1.2.0
>-PORTREVISION=	16
>+PORTREVISION=	17
> CATEGORIES=	multimedia
> MASTER_SITES=	SF/gmerlin/${PORTNAME}/${PORTVERSION}
> 
>@@ -20,7 +20,7 @@ OPTIONS_DEFINE=	A52 CDIO DCA DVDREAD FAAD FFMPEG FLAC GMERLIN MAD \
> 		SAMBA SCHROEDINGER SPEEX THEORA TIFF VDPAU VORBIS DOCS
> OPTIONS_DEFAULT=	A52 CDIO DCA DVDREAD FAAD FFMPEG FLAC GMERLIN MAD \
> 		MJPEGTOOLS MPEG2 MUSEPACK OPENJPEG OPTIMIZED_CFLAGS PNG \
>-		SAMBA SCHROEDINGER SPEEX THEORA TIFF VDPAU VORBIS
>+		SAMBA SCHROEDINGER SPEEX THEORA TIFF VORBIS
> DVDREAD_DESC=	libdvdread support
> GMERLIN_DESC=	gmerlin support
> SAMBA_DESC=	Samba support using libsmbclient
>@@ -162,6 +162,8 @@ CONFIGURE_ARGS+=--disable-schroedinger
> 
> .if ${PORT_OPTIONS:MVDPAU}
> LIB_DEPENDS+=	libvdpau.so:multimedia/libvdpau
>+# video_ffmpeg.c:788:14: error: no member named 'get_buffer' in 'struct AVCodecContext'
>+BROKEN=		fails to build with ffmpeg 3.x
> .else
> CONFIGURE_ARGS+=	--disable-vdpau
> .endif

Flags:

jbeich: maintainer-approval? (wg)

Actions: View | Diff

Attachments on bug 214824: 177380 | 177382