From: "Alexis Ballier" <aballier@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/freerdp/files/, net-misc/freerdp/
Date: Wed, 16 Sep 2015 20:57:05 +0000 (UTC) [thread overview]
Message-ID: <1442437019.036cf8158e6a78596ea5a9ea3455b3784926482f.aballier@gentoo> (raw)
commit: 036cf8158e6a78596ea5a9ea3455b3784926482f
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 16 20:56:52 2015 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Wed Sep 16 20:56:59 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=036cf815
net-misc/freerdp: fix build with ffmpeg git master.
Package-Manager: portage-2.2.20.1
net-misc/freerdp/files/freerdp-ffmpeg29.patch | 40 +++++++++++++++++++++++
net-misc/freerdp/freerdp-1.2.1_pre20150326.ebuild | 4 +--
2 files changed, 42 insertions(+), 2 deletions(-)
diff --git a/net-misc/freerdp/files/freerdp-ffmpeg29.patch b/net-misc/freerdp/files/freerdp-ffmpeg29.patch
new file mode 100644
index 0000000..6113c3b
--- /dev/null
+++ b/net-misc/freerdp/files/freerdp-ffmpeg29.patch
@@ -0,0 +1,40 @@
+Index: freerdp-1.2.1_pre20150326/channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c
+===================================================================
+--- freerdp-1.2.1_pre20150326.orig/channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c
++++ freerdp-1.2.1_pre20150326/channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c
+@@ -102,7 +102,7 @@ static BOOL tsmf_ffmpeg_init_video_strea
+ mdecoder->codec_context->bit_rate = media_type->BitRate;
+ mdecoder->codec_context->time_base.den = media_type->SamplesPerSecond.Numerator;
+ mdecoder->codec_context->time_base.num = media_type->SamplesPerSecond.Denominator;
+- mdecoder->frame = avcodec_alloc_frame();
++ mdecoder->frame = av_frame_alloc();
+ return TRUE;
+ }
+
+@@ -320,7 +320,7 @@ static BOOL tsmf_ffmpeg_decode_video(ITS
+ mdecoder->codec_context->width, mdecoder->codec_context->height);
+ mdecoder->decoded_data = malloc(mdecoder->decoded_size);
+ ZeroMemory(mdecoder->decoded_data, mdecoder->decoded_size);
+- frame = avcodec_alloc_frame();
++ frame = av_frame_alloc();
+ avpicture_fill((AVPicture*) frame, mdecoder->decoded_data,
+ mdecoder->codec_context->pix_fmt,
+ mdecoder->codec_context->width, mdecoder->codec_context->height);
+@@ -389,7 +389,7 @@ static BOOL tsmf_ffmpeg_decode_audio(ITS
+ (int16_t *) dst, &frame_size, src, src_size);
+ #else
+ {
+- AVFrame *decoded_frame = avcodec_alloc_frame();
++ AVFrame *decoded_frame = av_frame_alloc();
+ int got_frame = 0;
+ AVPacket pkt;
+ av_init_packet(&pkt);
+@@ -469,7 +469,7 @@ static UINT32 tsmf_ffmpeg_get_decoded_fo
+
+ switch (mdecoder->codec_context->pix_fmt)
+ {
+- case PIX_FMT_YUV420P:
++ case AV_PIX_FMT_YUV420P:
+ return RDP_PIXFMT_I420;
+ default:
+ WLog_ERR(TAG, "unsupported pixel format %u",
diff --git a/net-misc/freerdp/freerdp-1.2.1_pre20150326.ebuild b/net-misc/freerdp/freerdp-1.2.1_pre20150326.ebuild
index 4c23a32..5ca32d5 100644
--- a/net-misc/freerdp/freerdp-1.2.1_pre20150326.ebuild
+++ b/net-misc/freerdp/freerdp-1.2.1_pre20150326.ebuild
@@ -46,7 +46,7 @@ RDEPEND="
xv? ( x11-libs/libXv )
)
)
- ffmpeg? ( virtual/ffmpeg )
+ ffmpeg? ( >=virtual/ffmpeg-9 )
gstreamer? (
media-libs/gstreamer:1.0
media-libs/gst-plugins-base:1.0
@@ -80,7 +80,7 @@ DEPEND="${RDEPEND}
DOCS=( README )
-PATCHES=( "${FILESDIR}/freerdp-armfp.patch" )
+PATCHES=( "${FILESDIR}/freerdp-armfp.patch" "${FILESDIR}/freerdp-ffmpeg29.patch" )
src_configure() {
local mycmakeargs=(
next reply other threads:[~2015-09-16 20:57 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-09-16 20:57 Alexis Ballier [this message]
-- strict thread matches above, loose matches on Subject: below --
2015-11-08 17:44 [gentoo-commits] repo/gentoo:master commit in: net-misc/freerdp/files/, net-misc/freerdp/ Mike Gilbert
2017-03-20 20:58 Mike Gilbert
2017-07-28 21:03 Mike Gilbert
2017-08-26 19:05 Mike Gilbert
2017-12-14 20:04 Mike Gilbert
2018-05-16 21:19 Mike Gilbert
2018-12-02 17:15 Mike Gilbert
2018-12-04 17:31 Mike Gilbert
2019-10-07 17:18 Mike Gilbert
2019-12-12 20:15 Mike Gilbert
2020-04-10 14:49 Mike Gilbert
2020-05-09 4:15 Mike Gilbert
2020-05-14 22:15 Thomas Deutschmann
2020-06-08 17:25 Mike Gilbert
2020-07-18 13:19 Mike Gilbert
2020-08-30 21:42 Mike Gilbert
2021-07-31 19:57 Mike Gilbert
2021-08-11 15:04 Mike Gilbert
2021-10-23 16:09 Mike Gilbert
2021-10-24 14:29 Mike Gilbert
2022-05-02 21:25 Mike Gilbert
2023-06-07 10:34 Sam James
2023-12-07 21:00 Mike Gilbert
2024-05-22 17:33 Mike Gilbert
2025-02-18 19:46 Mike Gilbert
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1442437019.036cf8158e6a78596ea5a9ea3455b3784926482f.aballier@gentoo \
--to=aballier@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox