git » freerdp.git » commit d4031c6

diff --git a/PKGBUILD b/PKGBUILD
index ea487f9..e3388f0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,10 @@
 # Contributor: Stijn Segers <francesco dot borromini at gmail dot com>
 
 pkgname=freerdp
-pkgver=1.0.2
-pkgrel=7
+pkgver=1.1.0_beta+2013071101
+_pkgver=${pkgver/_/-}
+_pkgver=${_pkgver/+/-}
+pkgrel=1
 pkgdesc="Free RDP client"
 arch=('i686' 'x86_64')
 url="http://freerdp.sourceforge.net"
@@ -13,27 +15,27 @@ depends=('openssl' 'libxcursor' 'libcups' 'alsa-lib' 'libxext' 'libxdamage'
 makedepends=('krb5' 'cmake' 'damageproto' 'xmlto' 'docbook-xsl')
 conflicts=('freerdp-git')
 changelog=${pkgname}.changelog
-source=($pkgname-$pkgver.tar.gz::https://github.com/FreeRDP/FreeRDP/archive/$pkgver.tar.gz
+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'
+md5sums=('37259601bb43bb8f04d65f4ce1057582'
+         'ce01b9a60f8c57154de425e20f5884ca'
          'ac581d445ded7cdbd59082a48d9c28ac'
          '62d0ab241c16ee5d85ff89183df9bbc0'
          '1c1a8f77ebcaa7256968a9506ed3e772')
 
 prepare() {
-  cd $srcdir/FreeRDP-$pkgver
+  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 ../patch_numblock.patch
+#  patch -Np1 -i ../CVE-2014-0791.patch
+#  patch -Np1 -i ../stuck_winkey.patch
 }
 
 build() {
-  cd $srcdir/FreeRDP-$pkgver
+  cd $srcdir/FreeRDP-${_pkgver}
   cmake \
 	-DCMAKE_INSTALL_PREFIX=/usr \
 	-DCMAKE_INSTALL_LIBDIR=lib \
@@ -43,6 +45,6 @@ build() {
 }
 
 package() {
-  cd $srcdir/FreeRDP-$pkgver
+  cd $srcdir/FreeRDP-${_pkgver}
   make DESTDIR="${pkgdir}" install
 }
diff --git a/ffmpeg2.0.patch b/ffmpeg2.0.patch
index bc9022d..a4ce484 100644
--- a/ffmpeg2.0.patch
+++ b/ffmpeg2.0.patch
@@ -1,7 +1,7 @@
-diff -rupN a/channels/drdynvc/tsmf/ffmpeg/tsmf_ffmpeg.c b/channels/drdynvc/tsmf/ffmpeg/tsmf_ffmpeg.c
---- a/channels/drdynvc/tsmf/ffmpeg/tsmf_ffmpeg.c	2013-01-02 22:46:59.000000000 +0100
-+++ b/channels/drdynvc/tsmf/ffmpeg/tsmf_ffmpeg.c	2013-07-22 18:12:18.001576713 +0200
-@@ -28,6 +28,8 @@
+diff -wbBur FreeRDP-1.1.0-beta-2013071101.org/channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c FreeRDP-1.1.0-beta-2013071101/channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c
+--- FreeRDP-1.1.0-beta-2013071101.org/channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c	2013-07-10 12:00:21.000000000 +0400
++++ FreeRDP-1.1.0-beta-2013071101/channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c	2014-10-14 13:31:27.545141407 +0400
+@@ -37,6 +37,8 @@
  #include "tsmf_constants.h"
  #include "tsmf_decoder.h"
  
@@ -10,7 +10,7 @@ diff -rupN a/channels/drdynvc/tsmf/ffmpeg/tsmf_ffmpeg.c b/channels/drdynvc/tsmf/
  /* Compatibility with older FFmpeg */
  #if LIBAVUTIL_VERSION_MAJOR < 50
  #define AVMEDIA_TYPE_VIDEO 0
-@@ -39,7 +41,7 @@ typedef struct _TSMFFFmpegDecoder
+@@ -48,7 +50,7 @@
  	ITSMFDecoder iface;
  
  	int media_type;
@@ -19,16 +19,7 @@ diff -rupN a/channels/drdynvc/tsmf/ffmpeg/tsmf_ffmpeg.c b/channels/drdynvc/tsmf/
  	AVCodecContext* codec_context;
  	AVCodec* codec;
  	AVFrame* frame;
-@@ -54,7 +56,7 @@ static boolean tsmf_ffmpeg_init_context(
- {
- 	TSMFFFmpegDecoder* mdecoder = (TSMFFFmpegDecoder*) decoder;
- 
--	mdecoder->codec_context = avcodec_alloc_context();
-+	mdecoder->codec_context = avcodec_alloc_context3(NULL);
- 	if (!mdecoder->codec_context)
- 	{
- 		DEBUG_WARN("avcodec_alloc_context failed.");
-@@ -88,16 +90,6 @@ static boolean tsmf_ffmpeg_init_audio_st
+@@ -98,16 +100,6 @@
  	mdecoder->codec_context->channels = media_type->Channels;
  	mdecoder->codec_context->block_align = media_type->BlockAlign;
  
@@ -42,35 +33,6 @@ diff -rupN a/channels/drdynvc/tsmf/ffmpeg/tsmf_ffmpeg.c b/channels/drdynvc/tsmf/
 -#endif
 -#endif
 -
- 	return true;
+ 	return TRUE;
  }
  
-@@ -174,7 +166,7 @@ static boolean tsmf_ffmpeg_prepare(ITSMF
- {
- 	TSMFFFmpegDecoder* mdecoder = (TSMFFFmpegDecoder*) decoder;
- 
--	if (avcodec_open(mdecoder->codec_context, mdecoder->codec) < 0)
-+	if (avcodec_open2(mdecoder->codec_context, mdecoder->codec, NULL) < 0)
- 	{
- 		DEBUG_WARN("avcodec_open failed.");
- 		return false;
-@@ -372,8 +364,9 @@ static boolean tsmf_ffmpeg_decode_audio(
- 			av_init_packet(&pkt);
- 			pkt.data = (uint8*) src;
- 			pkt.size = src_size;
--			len = avcodec_decode_audio3(mdecoder->codec_context,
--				(int16_t*) dst, &frame_size, &pkt);
-+			AVFrame * frame = avcodec_alloc_frame (); 
-+			len = avcodec_decode_audio4(mdecoder->codec_context,
-+				frame, &frame_size, &pkt);
- 		}
- #endif
- 		if (len <= 0 || frame_size <= 0)
-@@ -499,7 +492,6 @@ TSMFDecoderEntry(void)
- 
- 	if (!initialized)
- 	{
--		avcodec_init();
- 		avcodec_register_all();
- 		initialized = true;
- 	}