[arch-commits] Commit in freerdp/repos (14 files)
Sergej Pupykin
spupykin at nymeria.archlinux.org
Wed Sep 25 13:56:49 UTC 2013
Date: Wednesday, September 25, 2013 @ 15:56:48
Author: spupykin
Revision: 97610
archrelease: copy trunk to community-i686, community-x86_64
Added:
freerdp/repos/community-i686/PKGBUILD
(from rev 97609, freerdp/trunk/PKGBUILD)
freerdp/repos/community-i686/ffmpeg2.0.patch
(from rev 97609, freerdp/trunk/ffmpeg2.0.patch)
freerdp/repos/community-i686/freerdp.changelog
(from rev 97609, freerdp/trunk/freerdp.changelog)
freerdp/repos/community-i686/patch_numblock.patch
(from rev 97609, freerdp/trunk/patch_numblock.patch)
freerdp/repos/community-x86_64/PKGBUILD
(from rev 97609, freerdp/trunk/PKGBUILD)
freerdp/repos/community-x86_64/ffmpeg2.0.patch
(from rev 97609, freerdp/trunk/ffmpeg2.0.patch)
freerdp/repos/community-x86_64/freerdp.changelog
(from rev 97609, freerdp/trunk/freerdp.changelog)
freerdp/repos/community-x86_64/patch_numblock.patch
(from rev 97609, freerdp/trunk/patch_numblock.patch)
Deleted:
freerdp/repos/community-i686/PKGBUILD
freerdp/repos/community-i686/ffmpeg2.0.patch
freerdp/repos/community-i686/freerdp.changelog
freerdp/repos/community-x86_64/PKGBUILD
freerdp/repos/community-x86_64/ffmpeg2.0.patch
freerdp/repos/community-x86_64/freerdp.changelog
---------------------------------------+
/PKGBUILD | 88 ++++++++++++++++++
/ffmpeg2.0.patch | 152 ++++++++++++++++++++++++++++++++
/freerdp.changelog | 4
community-i686/PKGBUILD | 41 --------
community-i686/ffmpeg2.0.patch | 76 ----------------
community-i686/freerdp.changelog | 2
community-i686/patch_numblock.patch | 12 ++
community-x86_64/PKGBUILD | 41 --------
community-x86_64/ffmpeg2.0.patch | 76 ----------------
community-x86_64/freerdp.changelog | 2
community-x86_64/patch_numblock.patch | 12 ++
11 files changed, 268 insertions(+), 238 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2013-09-25 13:56:29 UTC (rev 97609)
+++ community-i686/PKGBUILD 2013-09-25 13:56:48 UTC (rev 97610)
@@ -1,41 +0,0 @@
-# $Id$
-# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
-# Contributor: Stijn Segers <francesco dot borromini at gmail dot com>
-
-pkgname=freerdp
-pkgver=1.0.2
-pkgrel=3
-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-git')
-changelog=${pkgname}.changelog
-options=('!libtool')
-source=($pkgname-$pkgver.tar.gz::https://github.com/FreeRDP/FreeRDP/archive/$pkgver.tar.gz
- ffmpeg2.0.patch)
-md5sums=('c260051a94caff590def5caa4fcf59d6'
- '1260eecf01ea5212e2db8ac9c5e7fa6d')
-
-prepare() {
- cd $srcdir/FreeRDP-$pkgver
- patch -Np1 -i ../ffmpeg2.0.patch
-}
-
-build() {
- cd $srcdir/FreeRDP-$pkgver
- cmake \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DCMAKE_INSTALL_LIBDIR=lib \
- -DWITH_PULSEAUDIO=ON \
- .
- make
-}
-
-package() {
- cd $srcdir/FreeRDP-$pkgver
- make DESTDIR="${pkgdir}" install
-}
Copied: freerdp/repos/community-i686/PKGBUILD (from rev 97609, freerdp/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2013-09-25 13:56:48 UTC (rev 97610)
@@ -0,0 +1,44 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Contributor: Stijn Segers <francesco dot borromini at gmail dot com>
+
+pkgname=freerdp
+pkgver=1.0.2
+pkgrel=4
+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-git')
+changelog=${pkgname}.changelog
+options=('!libtool')
+source=($pkgname-$pkgver.tar.gz::https://github.com/FreeRDP/FreeRDP/archive/$pkgver.tar.gz
+ ffmpeg2.0.patch
+ patch_numblock.patch)
+md5sums=('c260051a94caff590def5caa4fcf59d6'
+ '1260eecf01ea5212e2db8ac9c5e7fa6d'
+ 'ac581d445ded7cdbd59082a48d9c28ac')
+
+prepare() {
+ cd $srcdir/FreeRDP-$pkgver
+ patch -Np1 -i ../ffmpeg2.0.patch
+ patch -Np1 -i ../patch_numblock.patch
+}
+
+build() {
+ cd $srcdir/FreeRDP-$pkgver
+ cmake \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_INSTALL_LIBDIR=lib \
+ -DWITH_PULSEAUDIO=ON \
+ .
+ make
+}
+
+package() {
+ cd $srcdir/FreeRDP-$pkgver
+ make DESTDIR="${pkgdir}" install
+}
Deleted: community-i686/ffmpeg2.0.patch
===================================================================
--- community-i686/ffmpeg2.0.patch 2013-09-25 13:56:29 UTC (rev 97609)
+++ community-i686/ffmpeg2.0.patch 2013-09-25 13:56:48 UTC (rev 97610)
@@ -1,76 +0,0 @@
-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 @@
- #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;
- }
Copied: freerdp/repos/community-i686/ffmpeg2.0.patch (from rev 97609, freerdp/trunk/ffmpeg2.0.patch)
===================================================================
--- community-i686/ffmpeg2.0.patch (rev 0)
+++ community-i686/ffmpeg2.0.patch 2013-09-25 13:56:48 UTC (rev 97610)
@@ -0,0 +1,76 @@
+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 @@
+ #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;
+ }
Deleted: community-i686/freerdp.changelog
===================================================================
--- community-i686/freerdp.changelog 2013-09-25 13:56:29 UTC (rev 97609)
+++ community-i686/freerdp.changelog 2013-09-25 13:56:48 UTC (rev 97610)
@@ -1,2 +0,0 @@
-0.7.1-1 to 0.7.1-2
-* Added x86_64 to supported architectures (tested by figue).
Copied: freerdp/repos/community-i686/freerdp.changelog (from rev 97609, freerdp/trunk/freerdp.changelog)
===================================================================
--- community-i686/freerdp.changelog (rev 0)
+++ community-i686/freerdp.changelog 2013-09-25 13:56:48 UTC (rev 97610)
@@ -0,0 +1,2 @@
+0.7.1-1 to 0.7.1-2
+* Added x86_64 to supported architectures (tested by figue).
Copied: freerdp/repos/community-i686/patch_numblock.patch (from rev 97609, freerdp/trunk/patch_numblock.patch)
===================================================================
--- community-i686/patch_numblock.patch (rev 0)
+++ community-i686/patch_numblock.patch 2013-09-25 13:56:48 UTC (rev 97610)
@@ -0,0 +1,12 @@
+diff -u -r -N old/include/freerdp/kbd/vkcodes.h new/include/freerdp/kbd/vkcodes.h
+--- old/include/freerdp/kbd/vkcodes.h 2013-09-19 12:46:07.124339712 +0200
++++ new/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" },
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2013-09-25 13:56:29 UTC (rev 97609)
+++ community-x86_64/PKGBUILD 2013-09-25 13:56:48 UTC (rev 97610)
@@ -1,41 +0,0 @@
-# $Id$
-# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
-# Contributor: Stijn Segers <francesco dot borromini at gmail dot com>
-
-pkgname=freerdp
-pkgver=1.0.2
-pkgrel=3
-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-git')
-changelog=${pkgname}.changelog
-options=('!libtool')
-source=($pkgname-$pkgver.tar.gz::https://github.com/FreeRDP/FreeRDP/archive/$pkgver.tar.gz
- ffmpeg2.0.patch)
-md5sums=('c260051a94caff590def5caa4fcf59d6'
- '1260eecf01ea5212e2db8ac9c5e7fa6d')
-
-prepare() {
- cd $srcdir/FreeRDP-$pkgver
- patch -Np1 -i ../ffmpeg2.0.patch
-}
-
-build() {
- cd $srcdir/FreeRDP-$pkgver
- cmake \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DCMAKE_INSTALL_LIBDIR=lib \
- -DWITH_PULSEAUDIO=ON \
- .
- make
-}
-
-package() {
- cd $srcdir/FreeRDP-$pkgver
- make DESTDIR="${pkgdir}" install
-}
Copied: freerdp/repos/community-x86_64/PKGBUILD (from rev 97609, freerdp/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2013-09-25 13:56:48 UTC (rev 97610)
@@ -0,0 +1,44 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Contributor: Stijn Segers <francesco dot borromini at gmail dot com>
+
+pkgname=freerdp
+pkgver=1.0.2
+pkgrel=4
+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-git')
+changelog=${pkgname}.changelog
+options=('!libtool')
+source=($pkgname-$pkgver.tar.gz::https://github.com/FreeRDP/FreeRDP/archive/$pkgver.tar.gz
+ ffmpeg2.0.patch
+ patch_numblock.patch)
+md5sums=('c260051a94caff590def5caa4fcf59d6'
+ '1260eecf01ea5212e2db8ac9c5e7fa6d'
+ 'ac581d445ded7cdbd59082a48d9c28ac')
+
+prepare() {
+ cd $srcdir/FreeRDP-$pkgver
+ patch -Np1 -i ../ffmpeg2.0.patch
+ patch -Np1 -i ../patch_numblock.patch
+}
+
+build() {
+ cd $srcdir/FreeRDP-$pkgver
+ cmake \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_INSTALL_LIBDIR=lib \
+ -DWITH_PULSEAUDIO=ON \
+ .
+ make
+}
+
+package() {
+ cd $srcdir/FreeRDP-$pkgver
+ make DESTDIR="${pkgdir}" install
+}
Deleted: community-x86_64/ffmpeg2.0.patch
===================================================================
--- community-x86_64/ffmpeg2.0.patch 2013-09-25 13:56:29 UTC (rev 97609)
+++ community-x86_64/ffmpeg2.0.patch 2013-09-25 13:56:48 UTC (rev 97610)
@@ -1,76 +0,0 @@
-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 @@
- #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;
- }
Copied: freerdp/repos/community-x86_64/ffmpeg2.0.patch (from rev 97609, freerdp/trunk/ffmpeg2.0.patch)
===================================================================
--- community-x86_64/ffmpeg2.0.patch (rev 0)
+++ community-x86_64/ffmpeg2.0.patch 2013-09-25 13:56:48 UTC (rev 97610)
@@ -0,0 +1,76 @@
+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 @@
+ #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;
+ }
Deleted: community-x86_64/freerdp.changelog
===================================================================
--- community-x86_64/freerdp.changelog 2013-09-25 13:56:29 UTC (rev 97609)
+++ community-x86_64/freerdp.changelog 2013-09-25 13:56:48 UTC (rev 97610)
@@ -1,2 +0,0 @@
-0.7.1-1 to 0.7.1-2
-* Added x86_64 to supported architectures (tested by figue).
Copied: freerdp/repos/community-x86_64/freerdp.changelog (from rev 97609, freerdp/trunk/freerdp.changelog)
===================================================================
--- community-x86_64/freerdp.changelog (rev 0)
+++ community-x86_64/freerdp.changelog 2013-09-25 13:56:48 UTC (rev 97610)
@@ -0,0 +1,2 @@
+0.7.1-1 to 0.7.1-2
+* Added x86_64 to supported architectures (tested by figue).
Copied: freerdp/repos/community-x86_64/patch_numblock.patch (from rev 97609, freerdp/trunk/patch_numblock.patch)
===================================================================
--- community-x86_64/patch_numblock.patch (rev 0)
+++ community-x86_64/patch_numblock.patch 2013-09-25 13:56:48 UTC (rev 97610)
@@ -0,0 +1,12 @@
+diff -u -r -N old/include/freerdp/kbd/vkcodes.h new/include/freerdp/kbd/vkcodes.h
+--- old/include/freerdp/kbd/vkcodes.h 2013-09-19 12:46:07.124339712 +0200
++++ new/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" },
More information about the arch-commits
mailing list