freerdp102

ffmpeg-consts.patch

--- a/channels/drdynvc/tsmf/ffmpeg/tsmf_ffmpeg.c        2017-07-14 22:14:21.921782192 +0200
+++ b/channels/drdynvc/tsmf/ffmpeg/tsmf_ffmpeg.c        2017-07-14 22:19:56.885658922 +0200
@@ -195,28 +195,28 @@ static boolean tsmf_ffmpeg_set_format(IT
        switch (media_type->SubType)
        {
                case TSMF_SUB_TYPE_WVC1:
-                       mdecoder->codec_id = CODEC_ID_VC1;
+                       mdecoder->codec_id = AV_CODEC_ID_VC1;
                        break;
                case TSMF_SUB_TYPE_WMA2:
-                       mdecoder->codec_id = CODEC_ID_WMAV2;
+                       mdecoder->codec_id = AV_CODEC_ID_WMAV2;
                        break;
                case TSMF_SUB_TYPE_WMA9:
-                       mdecoder->codec_id = CODEC_ID_WMAPRO;
+                       mdecoder->codec_id = AV_CODEC_ID_WMAPRO;
                        break;
                case TSMF_SUB_TYPE_MP3:
-                       mdecoder->codec_id = CODEC_ID_MP3;
+                       mdecoder->codec_id = AV_CODEC_ID_MP3;
                        break;
                case TSMF_SUB_TYPE_MP2A:
-                       mdecoder->codec_id = CODEC_ID_MP2;
+                       mdecoder->codec_id = AV_CODEC_ID_MP2;
                        break;
                case TSMF_SUB_TYPE_MP2V:
-                       mdecoder->codec_id = CODEC_ID_MPEG2VIDEO;
+                       mdecoder->codec_id = AV_CODEC_ID_MPEG2VIDEO;
                        break;
                case TSMF_SUB_TYPE_WMV3:
-                       mdecoder->codec_id = CODEC_ID_WMV3;
+                       mdecoder->codec_id = AV_CODEC_ID_WMV3;
                        break;
                case TSMF_SUB_TYPE_AAC:
-                       mdecoder->codec_id = CODEC_ID_AAC;
+                       mdecoder->codec_id = AV_CODEC_ID_AAC;
                        /* For AAC the pFormat is a HEAACWAVEINFO struct, and the codec data
                           is at the end of it. See
                           http://msdn.microsoft.com/en-us/library/dd757806.aspx */
@@ -228,10 +228,10 @@ static boolean tsmf_ffmpeg_set_format(IT
                        break;
                case TSMF_SUB_TYPE_H264:
                case TSMF_SUB_TYPE_AVC1:
-                       mdecoder->codec_id = CODEC_ID_H264;
+                       mdecoder->codec_id = AV_CODEC_ID_H264;
                        break;
                case TSMF_SUB_TYPE_AC3:
-                       mdecoder->codec_id = CODEC_ID_AC3;
+                       mdecoder->codec_id = AV_CODEC_ID_AC3;
                        break;
                default:
                        return false;
@@ -438,7 +438,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:

PKGBUILD

# $Id$
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Contributor: Stijn Segers <francesco dot borromini at gmail dot com>

pkgname=freerdp-102
_pkgname=freerdp
pkgver=1.0.2
pkgrel=7
pkgdesc="Free RDP client"
arch=('i686' 'x86_64')
url="http://freerdp.sourceforge.net"
license=('GPL')
depends=('openssl' 'libxcursor' 'libcups' 'alsa-lib' 'libxext' 'libxdamage'
         'ffmpeg' 'libxkbfile' 'libxinerama' 'libxv' 'libpulse')
makedepends=('krb5' 'cmake' 'damageproto' 'xmlto' 'docbook-xsl')
conflicts=('freerdp' 'freerdp-git')
provides=('freerdp')
changelog=${_pkgname}.changelog
source=($_pkgname-$pkgver.tar.gz::https://github.com/FreeRDP/FreeRDP/archive/$pkgver.tar.gz
        ffmpeg2.0.patch
        patch_numblock.patch
        CVE-2014-0791.patch
        stuck_winkey.patch)
md5sums=('c260051a94caff590def5caa4fcf59d6'
         '1260eecf01ea5212e2db8ac9c5e7fa6d'
         'ac581d445ded7cdbd59082a48d9c28ac'
         '62d0ab241c16ee5d85ff89183df9bbc0'
         '1c1a8f77ebcaa7256968a9506ed3e772')

prepare() {
  cd $srcdir/FreeRDP-$pkgver
  patch -Np1 -i ../ffmpeg2.0.patch
  patch -Np1 -i ../patch_numblock.patch
  patch -Np1 -i ../CVE-2014-0791.patch
  patch -Np1 -i ../stuck_winkey.patch
  patch -Np1 -i ../ffmpeg-consts.patch
}

build() {
  cd $srcdir/FreeRDP-$pkgver
  cmake \
        -DCMAKE_INSTALL_PREFIX=/usr \
        -DCMAKE_INSTALL_LIBDIR=lib \
        -DWITH_PULSEAUDIO=ON \
        -DOPENSSL_ROOT_DIR=/usr/lib/openssl-1.0 \
        -DOPENSSL_INCLUDE_DIR=/usr/include/openssl-1.0 \
        .
  make
}

package() {
  cd $srcdir/FreeRDP-$pkgver
  make DESTDIR="${pkgdir}" install
}

broke

Add --ignore-whitespace to L36, and it should work fine:

patch -Np1 --ignore-whitespace -i ../ffmpeg-consts.patch

This too

--- a/channels/drdynvc/tsmf/ffmpeg/tsmf_ffmpeg.c        2017-07-14 22:14:21.921782192 +0200
+++ b/channels/drdynvc/tsmf/ffmpeg/tsmf_ffmpeg.c        2017-07-14 22:19:56.885658922 +0200
@@ -156,8 +156,8 @@
                }
        }

-       if (mdecoder->codec->capabilities & CODEC_CAP_TRUNCATED)
-               mdecoder->codec_context->flags |= CODEC_FLAG_TRUNCATED;
+       if (mdecoder->codec->capabilities & AV_CODEC_CAP_TRUNCATED)
+               mdecoder->codec_context->flags |= AV_CODEC_FLAG_TRUNCATED;

        return true;
 }
@@ -195,28 +195,28 @@
        switch (media_type->SubType)
        {
                case TSMF_SUB_TYPE_WVC1:
-                       mdecoder->codec_id = CODEC_ID_VC1;
+                       mdecoder->codec_id = AV_CODEC_ID_VC1;
                        break;
                case TSMF_SUB_TYPE_WMA2:
-                       mdecoder->codec_id = CODEC_ID_WMAV2;
+                       mdecoder->codec_id = AV_CODEC_ID_WMAV2;
                        break;
                case TSMF_SUB_TYPE_WMA9:
-                       mdecoder->codec_id = CODEC_ID_WMAPRO;
+                       mdecoder->codec_id = AV_CODEC_ID_WMAPRO;
                        break;
                case TSMF_SUB_TYPE_MP3:
-                       mdecoder->codec_id = CODEC_ID_MP3;
+                       mdecoder->codec_id = AV_CODEC_ID_MP3;
                        break;
                case TSMF_SUB_TYPE_MP2A:
-                       mdecoder->codec_id = CODEC_ID_MP2;
+                       mdecoder->codec_id = AV_CODEC_ID_MP2;
                        break;
                case TSMF_SUB_TYPE_MP2V:
-                       mdecoder->codec_id = CODEC_ID_MPEG2VIDEO;
+                       mdecoder->codec_id = AV_CODEC_ID_MPEG2VIDEO;
                        break;
                case TSMF_SUB_TYPE_WMV3:
-                       mdecoder->codec_id = CODEC_ID_WMV3;
+                       mdecoder->codec_id = AV_CODEC_ID_WMV3;
                        break;
                case TSMF_SUB_TYPE_AAC:
-                       mdecoder->codec_id = CODEC_ID_AAC;
+                       mdecoder->codec_id = AV_CODEC_ID_AAC;
                        /* For AAC the pFormat is a HEAACWAVEINFO struct, and the codec data
                           is at the end of it. See
                           http://msdn.microsoft.com/en-us/library/dd757806.aspx */
@@ -228,10 +228,10 @@
                        break;
                case TSMF_SUB_TYPE_H264:
                case TSMF_SUB_TYPE_AVC1:
-                       mdecoder->codec_id = CODEC_ID_H264;
+                       mdecoder->codec_id = AV_CODEC_ID_H264;
                        break;
                case TSMF_SUB_TYPE_AC3:
-                       mdecoder->codec_id = CODEC_ID_AC3;
+                       mdecoder->codec_id = AV_CODEC_ID_AC3;
                        break;
                default:
                        return false;
@@ -438,7 +438,7 @@

        switch (mdecoder->codec_context->pix_fmt)
        {
-               case PIX_FMT_YUV420P:
+               case AV_PIX_FMT_YUV420P:
                        return RDP_PIXFMT_I420;

                default:
[