From 32a3552962e34dd40be60590446cdb394e1b9c34 Mon Sep 17 00:00:00 2001
From: Matteo Bernardini <ponce@slackbuilds.org>
Date: Tue, 19 Nov 2013 10:46:56 +0100
Subject: network/freerdp: Updated for version 20131115_ea18d2b.

Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
---
 network/freerdp/freerdp.SlackBuild    | 18 ++++++++++++------
 network/freerdp/freerdp.info          |  6 +++---
 network/freerdp/patch-ffmpeg-2.0.diff | 36 +++++++++++++++++++++++++++++++++++
 3 files changed, 51 insertions(+), 9 deletions(-)
 create mode 100644 network/freerdp/patch-ffmpeg-2.0.diff

(limited to 'network/freerdp')

diff --git a/network/freerdp/freerdp.SlackBuild b/network/freerdp/freerdp.SlackBuild
index abe6b5d96c..c69221b43b 100644
--- a/network/freerdp/freerdp.SlackBuild
+++ b/network/freerdp/freerdp.SlackBuild
@@ -26,13 +26,13 @@
 # Revision date: 2012/02/17
 
 PRGNAM=freerdp
-VERSION=${VERSION:-1.0.1}
+VERSION=${VERSION:-20131115_ea18d2b}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 # This is a bit messy, but that's how upstream serves it...
-TARNAME=FreeRDP-$VERSION.tar.gz
-UNTARNAME=$(tar tf $TARNAME 2>/dev/null | head -n 1 | tr -d \/)
+#TARNAME=FreeRDP-$VERSION.tar.gz
+#UNTARNAME=$(tar tf $TARNAME 2>/dev/null | head -n 1 | tr -d \/)
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -66,9 +66,12 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $UNTARNAME
-tar xvf $CWD/$TARNAME
-cd $UNTARNAME
+#rm -rf $UNTARNAME
+#tar xvf $CWD/$TARNAME
+#cd $UNTARNAME
+rm -fR $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.?z*
+cd $PRGNAM-$VERSION
 chown -R root:root .
 find . \
  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -76,6 +79,9 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
+# http://sourceforge.net/mailarchive/forum.php?thread_name=520BE6FD.5080803%40macports.org&forum_name=freerdp-devel
+patch -p0 < $CWD/patch-ffmpeg-2.0.diff
+
 mkdir -p build
 cd build
   cmake \
diff --git a/network/freerdp/freerdp.info b/network/freerdp/freerdp.info
index 517c155d4c..e53fe76c54 100644
--- a/network/freerdp/freerdp.info
+++ b/network/freerdp/freerdp.info
@@ -1,8 +1,8 @@
 PRGNAM="freerdp"
-VERSION="1.0.1"
+VERSION="20131115_ea18d2b"
 HOMEPAGE="http://www.freerdp.com/"
-DOWNLOAD="http://github.com/downloads/FreeRDP/FreeRDP/FreeRDP-1.0.1.tar.gz"
-MD5SUM="c843185e0ff22ce8409954651718f338"
+DOWNLOAD="http://ponce.cc/slackware/sources/repo/freerdp-20131115_ea18d2b.tar.xz"
+MD5SUM="851cf17c44372e0bc07392489e33b47f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="ffmpeg"
diff --git a/network/freerdp/patch-ffmpeg-2.0.diff b/network/freerdp/patch-ffmpeg-2.0.diff
new file mode 100644
index 0000000000..db579217e5
--- /dev/null
+++ b/network/freerdp/patch-ffmpeg-2.0.diff
@@ -0,0 +1,36 @@
+--- channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c.orig	2013-07-10 01:00:21.000000000 -0700
++++ channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c	2013-08-12 22:26:28.000000000 -0700
+@@ -43,12 +43,20 @@
+ #define AVMEDIA_TYPE_AUDIO 1
+ #endif
+ 
++#ifndef AVCODEC_MAX_AUDIO_FRAME_SIZE
++#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000 // 1 second of 48khz 32bit audio
++#endif
++
+ typedef struct _TSMFFFmpegDecoder
+ {
+ 	ITSMFDecoder iface;
+ 
+ 	int media_type;
++#if LIBAVCODEC_VERSION_MAJOR > 54
++	enum AVCodecID codec_id;
++#else
+ 	enum CodecID codec_id;
++#endif
+ 	AVCodecContext* codec_context;
+ 	AVCodec* codec;
+ 	AVFrame* frame;
+@@ -99,8 +107,12 @@
+ 	mdecoder->codec_context->block_align = media_type->BlockAlign;
+ 
+ #ifdef AV_CPU_FLAG_SSE2
++#if LIBAVCODEC_VERSION_MAJOR < 55
+ 	mdecoder->codec_context->dsp_mask = AV_CPU_FLAG_SSE2 | AV_CPU_FLAG_MMX2;
+ #else
++	av_set_cpu_flags_mask(AV_CPU_FLAG_SSE2 | AV_CPU_FLAG_MMX2); 
++#endif
++#else
+ #if LIBAVCODEC_VERSION_MAJOR < 53
+ 	mdecoder->codec_context->dsp_mask = FF_MM_SSE2 | FF_MM_MMXEXT;
+ #else
-- 
cgit v1.2.3