Date: Fri, 25 Oct 2013 10:58:54 +0000 (UTC) From: William Grzybowski <wg@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r331566 - in head/net/freerdp: . files Message-ID: <201310251058.r9PAwsi4019861@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: wg Date: Fri Oct 25 10:58:53 2013 New Revision: 331566 URL: http://svnweb.freebsd.org/changeset/ports/331566 Log: net/freerdp: fix build with ffmpeg - Fix build with ffmpeg Reported by: dinoex Approved by: portmgr (bapt, implicit) Added: head/net/freerdp/files/patch-channels-drdynvc-tsmf-ffmpeg-tsmf_ffmpeg.c (contents, props changed) Deleted: head/net/freerdp/files/patch-cmake_FindFFmpeg.cmake Modified: head/net/freerdp/Makefile Modified: head/net/freerdp/Makefile ============================================================================== --- head/net/freerdp/Makefile Fri Oct 25 09:02:56 2013 (r331565) +++ head/net/freerdp/Makefile Fri Oct 25 10:58:53 2013 (r331566) @@ -61,15 +61,8 @@ CMAKE_ARGS+= -DWITH_ALSA=OFF .endif .if ${PORT_OPTIONS:MFFMPEG} -# the newer ffmpeg is prefered -LIB_DEPENDS+= avcodec-devel:${PORTSDIR}/multimedia/ffmpeg-devel \ - avutil-devel:${PORTSDIR}/multimedia/ffmpeg-devel -AVCODEC_INCLUDE_DIR= ${LOCALBASE}/include/ffmpeg-devel -AVCODEC_LIBRARY= ${LOCALBASE}/lib/ffmpeg-devel -AVUTIL_INCLUDE_DIR= ${AVCODEC_INCLUDE_DIR} -AVUTIL_LIBRARY= ${AVCODEC_LIBRARY} -CFLAGS+= -I${AVCODEC_INCLUDE_DIR} -LDFLAGS+= -I${AVCODEC_LIBRARY} +LIB_DEPENDS+= libavcodec.so:${PORTSDIR}/multimedia/ffmpeg \ + libavutil.so:${PORTSDIR}/multimedia/ffmpeg PLIST_SUB+= FFMPEG="" .else CMAKE_ARGS+= -DWITH_FFMPEG=OFF Added: head/net/freerdp/files/patch-channels-drdynvc-tsmf-ffmpeg-tsmf_ffmpeg.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/freerdp/files/patch-channels-drdynvc-tsmf-ffmpeg-tsmf_ffmpeg.c Fri Oct 25 10:58:53 2013 (r331566) @@ -0,0 +1,36 @@ +--- channels/drdynvc/tsmf/ffmpeg/tsmf_ffmpeg.c.orig 2013-10-25 08:48:35.385869420 -0200 ++++ channels/drdynvc/tsmf/ffmpeg/tsmf_ffmpeg.c 2013-10-25 08:54:54.476872888 -0200 +@@ -34,12 +34,16 @@ + #define AVMEDIA_TYPE_AUDIO 1 + #endif + ++#ifndef AVCODEC_MAX_AUDIO_FRAME_SIZE ++#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000 ++#endif ++ + typedef struct _TSMFFFmpegDecoder + { + ITSMFDecoder iface; + + int media_type; +- enum CodecID codec_id; ++ enum AVCodecID codec_id; + AVCodecContext* codec_context; + AVCodec* codec; + AVFrame* frame; +@@ -89,13 +93,9 @@ + mdecoder->codec_context->block_align = media_type->BlockAlign; + + #ifdef AV_CPU_FLAG_SSE2 +- mdecoder->codec_context->dsp_mask = AV_CPU_FLAG_SSE2 | AV_CPU_FLAG_MMX2; ++ av_set_cpu_flags_mask(AV_CPU_FLAG_SSE2 | AV_CPU_FLAG_MMX2); + #else +-#if LIBAVCODEC_VERSION_MAJOR < 53 +- mdecoder->codec_context->dsp_mask = FF_MM_SSE2 | FF_MM_MMXEXT; +-#else +- mdecoder->codec_context->dsp_mask = FF_MM_SSE2 | FF_MM_MMX2; +-#endif ++ av_set_cpu_flags_mask(FF_MM_SSE2 | FF_MM_MMX2); + #endif + + return true;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310251058.r9PAwsi4019861>