commit 6d16b98a9cab97fb2dffd6a6df22f079ff614013 Author: Alan Mizrahi <alan+crux@mizrahi.com.ve> Date: Tue Mar 26 03:53:56 2019 +0900 freerdp: fix dependencies, build with newer ffmpeg diff --git a/freerdp/.signature b/freerdp/.signature index 0d6217039..cc6e8e108 100644 --- a/freerdp/.signature +++ b/freerdp/.signature @@ -1,6 +1,6 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/bBOrB9E0hj+3Z1ofYrSU8gHit0dUHAzvEEo0xB8vva5lBADZ3UvpWOSweMsB+doke8lcQu/bO2biBVfYzNV/A8= -SHA256 (Pkgfile) = ada0c4b97a79ca5378c75b3608f004764bac6e360c4d8232c32a6968037c70d9 +RWSE3ohX2g5d/fnCDMGQLrJGZftVx6djQI6OHSHyWeJx6+01y3fv+eAEtBwVnAVxEcNzBS4fO87nc6H35VzC5qubm3VjOoze2Ao= +SHA256 (Pkgfile) = aa6313ab07a0baed029b491b801e4262f00cf52982e78cdf68d81bd71d09f63c SHA256 (.footprint) = 403f893c0b2f2d9ae8ee84962779d0a786ae9a2ee89916a58bf3f134f88054bf SHA256 (freerdp-1.0.2.tar.gz) = d519f2dca794366a15825b8c9f751dfd06018fd4fa3890840f3f6c6e0bcfe9d5 SHA256 (ffmpeg.patch) = b144699f853d757344470555ac029e3e93c68104595734ba66871986ca449be9 diff --git a/freerdp/Pkgfile b/freerdp/Pkgfile index e62253a2e..789eb4783 100644 --- a/freerdp/Pkgfile +++ b/freerdp/Pkgfile @@ -1,7 +1,7 @@ # Description: Remote desktop protocol implementation # URL: http://www.freerdp.com/ # Maintainer: Alan Mizrahi, alan at mizrahi dot com dot ve -# Depends on: xorg-libx11 xorg-libxrender xorg-libxcursor xorg-libxext +# Depends on: cmake xorg-libx11 xorg-libxrender xorg-libxcursor xorg-libxext # Optional: ffmpeg alsa-lib cups directfb neon pulseaudio xmlto name=freerdp @@ -11,7 +11,12 @@ source=(http://pub.freerdp.com/releases/freerdp-$version.tar.gz ffmpeg.patch) build() { # fix build with different versions of ffmpeg - patch -p1 -i $SRC/ffmpeg.patch -d $name-$version + patch -p0 -i $SRC/ffmpeg.patch + + # fix for even newer ffmpeg + sed -ri \ + 's/([^a-zA-Z_+])(CODEC_CAP_TRUNCATED|CODEC_FLAG_TRUNCATED|CODEC_FLAG_LOOP_FILTER)/\1AV_\2/g' \ + $name-$version/channels/drdynvc/tsmf/ffmpeg/tsmf_ffmpeg.c mkdir build; cd build @@ -20,6 +25,11 @@ build() { -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_SKIP_RPATH=ON \ -DWITH_PULSEAUDIO=$([ -f /usr/include/pulse/pulseaudio.h ] && echo "ON" || echo "OFF") \ + -DWITH_CUPS=$([ -f /usr/include/cups/cups.h ] && echo "ON" || echo "OFF") \ + -DWITH_ALSA=$([ -f /usr/include/alsa/version.h ] && echo "ON" || echo "OFF") \ + -DWITH_FFMPEG=$([ -f /usr/include/libavcodec/avcodec.h ] && echo "ON" || echo "OFF") \ + -DWITH_SSE2=$(grep -q '\bsse2\b' /proc/cpuinfo && echo ON || echo OFF) \ + -DWITH_SSE2_TARGET=$(grep -q '\bsse2\b' /proc/cpuinfo && echo ON || echo OFF) \ -DWITH_SERVER=OFF \ -DWITH_CLIENT=ON make