freerdp ffmpeg21 patch is in gentoo

4 files changed, 0 insertions, 229 deletions

diff --git a/net-misc/freerdp/Manifest b/net-misc/freerdp/Manifest
deleted file mode 100644
index af9c0c3..0000000
--- a/net-misc/freerdp/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX ffmpeg21.patch 3900 SHA256 2da6064c0ce3b02df6587c34dde65a8a2313edc411d8205cf80e9cfe4e7c6ca5 SHA512 12fc2cd97e641f57c1253b02f7db884b149f98cf41e71505c85456c48433c8b30f6ae75bca81eefcdc3132c2c2cf76b0e5dce1d42e357813c54e808dc49e74f4 WHIRLPOOL 93190e1066cc063f7dcdaa92eb29a414a01bb381c2cb2356f1a91228a27712510623d13300f582895fe91e60ff29092d265753ddffa4d6608653d7934508c89f
-DIST freerdp-1.1.0_beta1_p20130710.tar.gz 6682149 SHA256 0d0d2eec7e78b61458415ee98ad54379b31e9fc269b8bacf3e939bd048ac5e61 SHA512 89ec08acff5c9bbafe107cd079005146b6c4447fbe3172d8f774a20ab6b5e1f24abdeab2d7cb0d7694251aaea2924b0a10f1c0b4b660994cdfa51e8428b90440 WHIRLPOOL 2f7c04bde54293fc8fc85ba03baf7dc64e5da4cecdc87aaaa2ff316127abc43f0b56d70e14652f97f2e97a8f43bee8880837a94230448397dfad5f4ddbd055b1
-EBUILD freerdp-1.1.0_beta1_p20130710.ebuild 2572 SHA256 dccd9603d47f11cd40d7984e272570d2bbb7b931a0c962ccf762b74e0f9d9407 SHA512 b85ffd6c89979961918f9eaaa55dd939546dd372f9efb157bd3fc284ce52dd4e5b45fbad44115e358779a95e77526fcb5501882bc769099f70bbd30063d49c30 WHIRLPOOL 3ede471920e42fb195a7baa343cf11d5127b0eaeddc7d03dd9999e7a9d41bb1fbb1473e8a24777d49beb585d253c5c981a4829aa3ebc9d064fa9ee0b2f1ebe9d
-MISC metadata.xml 410 SHA256 a72feebca542632c8bf273df04b6e734c369d69e76bcdc4b2b7ad2896e0da3fd SHA512 1f47833a84fa53b694ae3ddc20c7bcd4fe9fca22cd51f1e670a744060ffa629cf03250b9bfde02539ed82a4bda409171b4f19bb9a10ae4ef9ebe05723dc33978 WHIRLPOOL f3a15d853f73840ef736aebc0f40a4318527260912912667869788596384fd8a840d063b817621af01b209646dc4b5b5cef37ce8bb4a9c5d8b716a1977c59056
diff --git a/net-misc/freerdp/files/ffmpeg21.patch b/net-misc/freerdp/files/ffmpeg21.patch
deleted file mode 100644
index b6a9c8d..0000000
--- a/net-misc/freerdp/files/ffmpeg21.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-commit bf065f3e892e0a94e442de9a7155a7ac170f2add
-Author: eroen <eroen@falcon.eroen.eu>
-Date:   Thu Nov 21 11:35:53 2013 +0100
-
-    ffmpeg-2 -- AVCODEC_MAX_AUDIO_FRAME_SIZE
-    
-    deprecated:
-    http://git.videolan.org/?p=ffmpeg.git;a=commit;h=0eea212943544d40f99b05571aa7159d78667154
-    
-    broken with libavcodec 54
-
-diff --git a/channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c b/channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c
-index adf8e04..0d5b956 100644
---- a/channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c
-+++ b/channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c
-@@ -43,6 +43,12 @@
- #define AVMEDIA_TYPE_AUDIO 1
- #endif
- 
-+#if LIBAVCODEC_VERSION_MAJOR < 54
-+#define MAX_AUDIO_FRAME_SIZE AVCODEC_MAX_AUDIO_FRAME_SIZE
-+#else
-+#define MAX_AUDIO_FRAME_SIZE 192000
-+#endif
-+
- typedef struct _TSMFFFmpegDecoder
- {
- 	ITSMFDecoder iface;
-@@ -351,7 +357,7 @@ static BOOL tsmf_ffmpeg_decode_audio(ITSMFDecoder* decoder, const BYTE* data, UI
- #endif
- 
- 	if (mdecoder->decoded_size_max == 0)
--		mdecoder->decoded_size_max = AVCODEC_MAX_AUDIO_FRAME_SIZE + 16;
-+		mdecoder->decoded_size_max = MAX_AUDIO_FRAME_SIZE + 16;
- 	mdecoder->decoded_data = malloc(mdecoder->decoded_size_max);
- 	ZeroMemory(mdecoder->decoded_data, mdecoder->decoded_size_max);
- 	/* align the memory for SSE2 needs */
-@@ -363,7 +369,7 @@ static BOOL tsmf_ffmpeg_decode_audio(ITSMFDecoder* decoder, const BYTE* data, UI
- 	while (src_size > 0)
- 	{
- 		/* Ensure enough space for decoding */
--		if (mdecoder->decoded_size_max - mdecoder->decoded_size < AVCODEC_MAX_AUDIO_FRAME_SIZE)
-+		if (mdecoder->decoded_size_max - mdecoder->decoded_size < MAX_AUDIO_FRAME_SIZE)
- 		{
- 			mdecoder->decoded_size_max = mdecoder->decoded_size_max * 2 + 16;
- 			mdecoder->decoded_data = realloc(mdecoder->decoded_data, mdecoder->decoded_size_max);
-
-commit cbcf0de3fac985afaeeef7daf104c94ad8cdca26
-Author: eroen <eroen@falcon.eroen.eu>
-Date:   Thu Nov 21 13:14:04 2013 +0100
-
-    ffmpeg-2 -- dsp_mask
-    
-    deprecated:
-    http://git.videolan.org/?p=ffmpeg.git;a=commit;h=95510be8c35753da8f48062b28b65e7acdab965f
-    
-    broken with libavcodec 55
-
-diff --git a/channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c b/channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c
-index 0d5b956..1f99ec3 100644
---- a/channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c
-+++ b/channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c
-@@ -104,6 +104,7 @@ static BOOL tsmf_ffmpeg_init_audio_stream(ITSMFDecoder* decoder, const TS_AM_MED
- 	mdecoder->codec_context->channels = media_type->Channels;
- 	mdecoder->codec_context->block_align = media_type->BlockAlign;
- 
-+#if LIBAVCODEC_VERSION_MAJOR < 55
- #ifdef AV_CPU_FLAG_SSE2
- 	mdecoder->codec_context->dsp_mask = AV_CPU_FLAG_SSE2 | AV_CPU_FLAG_MMX2;
- #else
-@@ -113,6 +114,13 @@ static BOOL tsmf_ffmpeg_init_audio_stream(ITSMFDecoder* decoder, const TS_AM_MED
- 	mdecoder->codec_context->dsp_mask = FF_MM_SSE2 | FF_MM_MMX2;
- #endif
- #endif
-+#else  /* LIBAVCODEC_VERSION_MAJOR < 55 */
-+#ifdef AV_CPU_FLAG_SSE2
-+	av_set_cpu_flags_mask(AV_CPU_FLAG_SSE2 | AV_CPU_FLAG_MMX2);
-+#else
-+	av_set_cpu_flags_mask(FF_MM_SSE2 | FF_MM_MMX2);
-+#endif
-+#endif /* LIBAVCODEC_VERSION_MAJOR < 55 */
- 
- 	return TRUE;
- }
-
-commit 6fe23e1a3860528a8ecdfc8e9ccfdbd0e3945869
-Author: eroen <eroen@falcon.eroen.eu>
-Date:   Thu Nov 21 13:26:03 2013 +0100
-
-    ffmpeg-2 -- CodecID
-    
-    deprecated:
-    http://git.videolan.org/?p=ffmpeg.git;a=commit;h=104e10fb426f903ba9157fdbfe30292d0e4c3d72
-    
-    broken with libavcodec 55
-
-diff --git a/channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c b/channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c
-index 1f99ec3..09b4f68 100644
---- a/channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c
-+++ b/channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c
-@@ -54,7 +54,11 @@ typedef struct _TSMFFFmpegDecoder
- 	ITSMFDecoder iface;
- 
- 	int media_type;
-+#if LIBAVCODEC_VERSION_MAJOR < 55
- 	enum CodecID codec_id;
-+#else
-+	enum AVCodecID codec_id;
-+#endif
- 	AVCodecContext* codec_context;
- 	AVCodec* codec;
- 	AVFrame* frame;
diff --git a/net-misc/freerdp/freerdp-1.1.0_beta1_p20130710.ebuild b/net-misc/freerdp/freerdp-1.1.0_beta1_p20130710.ebuild
deleted file mode 100644
index 75421b6..0000000
--- a/net-misc/freerdp/freerdp-1.1.0_beta1_p20130710.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/freerdp/freerdp-1.1.0_beta1_p20130710.ebuild,v 1.3 2013/11/11 16:32:17 floppym Exp $
-
-EAPI="5"
-
-inherit cmake-utils vcs-snapshot
-
-if [[ ${PV} != 9999* ]]; then
-	COMMIT="780d451afad21a22d2af6bd030ee71311856f038"
-	SRC_URI="https://github.com/FreeRDP/FreeRDP/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-else
-	inherit git-2
-	SRC_URI=""
-	EGIT_REPO_URI="git://github.com/FreeRDP/FreeRDP.git
-		https://github.com/FreeRDP/FreeRDP.git"
-	KEYWORDS=""
-fi
-
-DESCRIPTION="Free implementation of the Remote Desktop Protocol"
-HOMEPAGE="http://www.freerdp.com/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="alsa +channels +client cups debug directfb doc ffmpeg gstreamer jpeg
-	pulseaudio server smartcard sse2 test X xinerama xv"
-
-RDEPEND="
-	dev-libs/openssl
-	sys-libs/zlib
-	alsa? ( media-libs/alsa-lib )
-	cups? ( net-print/cups )
-	client? (
-		X? (
-			x11-libs/libXcursor
-			x11-libs/libXext
-			x11-libs/libXi
-			x11-libs/libXrender
-			xinerama? ( x11-libs/libXinerama )
-			xv? ( x11-libs/libXv )
-		)
-	)
-	directfb? ( dev-libs/DirectFB )
-	ffmpeg? ( virtual/ffmpeg )
-	gstreamer? (
-		media-libs/gstreamer:0.10
-		media-libs/gst-plugins-base:0.10
-		x11-libs/libXrandr
-	)
-	jpeg? ( virtual/jpeg )
-	pulseaudio? ( media-sound/pulseaudio )
-	server? (
-		X? (
-			x11-libs/libXcursor
-			x11-libs/libXdamage
-			x11-libs/libXext
-			x11-libs/libXfixes
-			xinerama? ( x11-libs/libXinerama )
-		)
-	)
-	smartcard? ( sys-apps/pcsc-lite )
-	X? (
-		x11-libs/libX11
-		x11-libs/libxkbfile
-	)
-"
-DEPEND="${RDEPEND}
-	client? ( X? ( doc? (
-		app-text/docbook-xml-dtd:4.1.2
-		app-text/xmlto
-	) ) )
-"
-
-PATCHES=( "${FILESDIR}"/ffmpeg21.patch )
-DOCS=( README )
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_with alsa ALSA)
-		$(cmake-utils_use_with channels CHANNELS)
-		$(cmake-utils_use_with client CLIENT)
-		$(cmake-utils_use_with cups CUPS)
-		$(cmake-utils_use_with debug DEBUG_ALL)
-		$(cmake-utils_use_with doc MANPAGES)
-		$(cmake-utils_use_with directfb DIRECTFB)
-		$(cmake-utils_use_with ffmpeg FFMPEG)
-		$(cmake-utils_use_with gstreamer GSTREAMER)
-		$(cmake-utils_use_with jpeg JPEG)
-		$(cmake-utils_use_with pulseaudio PULSEAUDIO)
-		$(cmake-utils_use_with server SERVER)
-		$(cmake-utils_use_with smartcard PCSC)
-		$(cmake-utils_use_with sse2 SSE2)
-		$(cmake-utils_use_with X X11)
-		$(cmake-utils_use_with xinerama XINERAMA)
-		$(cmake-utils_use_with xv XV)
-		$(cmake-utils_use_build test TESTING)
-	)
-	cmake-utils_src_configure
-}
diff --git a/net-misc/freerdp/metadata.xml b/net-misc/freerdp/metadata.xml
deleted file mode 100644
index bcfaa33..0000000
--- a/net-misc/freerdp/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer>
-		<email>floppym@gentoo.org</email>
-		<name>Mike Gilbert</name>
-	</maintainer>
-	<use>
-		<flag name="channels">Build virtual channel plugins</flag>
-		<flag name="client">Build client binaries</flag>
-		<flag name="server">Build server binaries</flag>
-	</use>
-</pkgmetadata>