New package: freerdp-1.0.2 (close #271).

This commit is contained in:
Juan RP 2014-02-01 17:22:53 +01:00
parent 3dfc6352d5
commit 6b6aaf2e9e
4 changed files with 122 additions and 0 deletions

1
srcpkgs/freerdp-devel Symbolic link
View File

@ -0,0 +1 @@
freerdp

View File

@ -0,0 +1,75 @@
--- channels/drdynvc/tsmf/ffmpeg/tsmf_ffmpeg.c 2013-01-02 22:46:59.000000000 +0100
+++ channels/drdynvc/tsmf/ffmpeg/tsmf_ffmpeg.c 2013-07-22 18:12:18.001576713 +0200
@@ -28,6 +28,8 @@
#include "tsmf_constants.h"
#include "tsmf_decoder.h"
+#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000
+
/* Compatibility with older FFmpeg */
#if LIBAVUTIL_VERSION_MAJOR < 50
#define AVMEDIA_TYPE_VIDEO 0
@@ -39,7 +41,7 @@ typedef struct _TSMFFFmpegDecoder
ITSMFDecoder iface;
int media_type;
- enum CodecID codec_id;
+ enum AVCodecID codec_id;
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
mdecoder->codec_context->channels = media_type->Channels;
mdecoder->codec_context->block_align = media_type->BlockAlign;
-#ifdef AV_CPU_FLAG_SSE2
- mdecoder->codec_context->dsp_mask = AV_CPU_FLAG_SSE2 | AV_CPU_FLAG_MMX2;
-#else
-#if LIBAVCODEC_VERSION_MAJOR < 53
- mdecoder->codec_context->dsp_mask = FF_MM_SSE2 | FF_MM_MMXEXT;
-#else
- mdecoder->codec_context->dsp_mask = FF_MM_SSE2 | FF_MM_MMX2;
-#endif
-#endif
-
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;
}

View File

@ -0,0 +1,11 @@
--- include/freerdp/kbd/vkcodes.h 2013-09-19 12:46:07.124339712 +0200
+++ include/freerdp/kbd/vkcodes.h 2013-09-19 12:45:51.621005583 +0200
@@ -434,7 +434,7 @@
{ 0x00, 0, "VK_SEPARATOR" , NULL },
{ 0x4A, 0, "VK_SUBTRACT" , "KPSU" },
{ 0x53, 0, "VK_DECIMAL" , "KPDL" },
- { 0x35, 0, "VK_DIVIDE" , "KPDV" },
+ { 0x35, 1, "VK_DIVIDE" , "KPDV" },
{ 0x3B, 0, "VK_F1" , "FK01" },
{ 0x3C, 0, "VK_F2" , "FK02" },
{ 0x3D, 0, "VK_F3" , "FK03" },

35
srcpkgs/freerdp/template Normal file
View File

@ -0,0 +1,35 @@
# Template file for 'freerdp'
pkgname=freerdp
version=1.0.2
revision=1
create_srcdir=yes
wrksrc="FreeRDP-${version}"
build_style=cmake
configure_args="-DWITH_JPEG=ON -DWITH_PULSE=ON -DWITH_XINERAMA=ON
-DWITH_XEXT=ON -DWITH_XCURSOR=ON -DWITH_XI=ON -DWITH_XRENDER=ON -DWITH_XV=ON
-DWITH_XKBFILE=ON -DWITH_FFMPEG=ON -DWITH_GSTREAMER=OFF -DWITH_ALSA=ON
-DWITH_CUPS=OFF -DWITH_PCSC=OFF -DCMAKE_INSTALL_LIBDIR=lib"
hostmakedepends="pkg-config cmake"
makedepends="alsa-lib-devel libjpeg-turbo-devel pulseaudio-devel libXinerama-devel
libXext-devel libXcursor-devel libXi-devel libXrender-devel libXv-devel
libxkbfile-devel ffmpeg-devel openssl-devel"
short_desc="A Free RDP (Remote Desktop Protocol) client"
maintainer="Juan RP <xtraeme@gmail.com>"
license="Apache-2.0"
homepage="http://freerdp.sourceforge.net"
distfiles="https://github.com/FreeRDP/FreeRDP/archive/${version}.tar.gz"
checksum=c0f137df7ab6fb76d7e7d316ae4e0ca6caf356e5bc0b5dadbdfadea5db992df1
case "$XBPS_TARGET_MACHINE" in
i686*|x86_64*) configure_args+=" -DWITH_SSE2=ON";;
esac
freerdp-devel_package() {
short_desc+=" - development files"
depends="${sourcepkg}>=${version}_${revision}"
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
vmove "usr/lib/*.so"
}
}