From 7d4e98b2d6f2fd4d42ebb55105bab8a05e34ab94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?=
 <emulatorman@lavabit.com>
Date: Sat, 6 Apr 2013 08:09:02 -0300
Subject: mediastreamer: add new package to [pcr] due that is unstable for
 linphone package

---
 pcr/mediastreamer/PKGBUILD                   | 33 ++++++++++++++++
 pcr/mediastreamer/mediastreamer-ffmpeg.patch | 57 ++++++++++++++++++++++++++++
 2 files changed, 90 insertions(+)
 create mode 100644 pcr/mediastreamer/PKGBUILD
 create mode 100644 pcr/mediastreamer/mediastreamer-ffmpeg.patch

diff --git a/pcr/mediastreamer/PKGBUILD b/pcr/mediastreamer/PKGBUILD
new file mode 100644
index 000000000..e55ace473
--- /dev/null
+++ b/pcr/mediastreamer/PKGBUILD
@@ -0,0 +1,33 @@
+# $Id$
+# Maintainer:
+# Contributor: Andrea Scarpino <andrea@archlinux.org>
+# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Contributor: Adrià Arrufat <swiftscythe@gmail.com>
+
+pkgname=mediastreamer
+pkgver=2.8.2
+pkgrel=4.1
+pkgdesc="A library written in C that allows you to create and run audio and video streams"
+arch=('i686' 'x86_64')
+url="http://www.linphone.org/"
+license=('GPL')
+depends=('ortp' 'speex' 'ffmpeg=1:1.2' 'v4l-utils' 'libxv' 'libpulse')
+makedepends=('intltool')
+options=('!libtool')
+source=("http://download-mirror.savannah.gnu.org/releases/linphone/${pkgname}/${pkgname}-${pkgver}.tar.gz"{,.sig}
+        mediastreamer-ffmpeg.patch)
+md5sums=('e51ea9d5fce1396b374d10473dfbadec'
+         '805da7def98f367e621363fa0c951fe8'
+         '553d5d47ea4a8c8dfeabdc0281849d5f')
+
+build() {
+  cd "${srcdir}"/$pkgname-$pkgver
+  patch -p1 -i "${srcdir}"/mediastreamer-ffmpeg.patch
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}"/$pkgname-$pkgver
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/pcr/mediastreamer/mediastreamer-ffmpeg.patch b/pcr/mediastreamer/mediastreamer-ffmpeg.patch
new file mode 100644
index 000000000..3304e9f56
--- /dev/null
+++ b/pcr/mediastreamer/mediastreamer-ffmpeg.patch
@@ -0,0 +1,57 @@
+commit f586917ea4d66f9ba8910f0967a8830e54d50784
+Author: Yann Diorcet <yann.diorcet@belledonne-communications.com>
+Date:   Tue Jun 5 11:07:48 2012 +0200
+
+    Fixes for new versions of ffmpeg
+
+diff --git a/src/h264dec.c b/src/h264dec.c
+index c4a84ee..5229b5e 100644
+--- a/src/h264dec.c
++++ b/src/h264dec.c
+@@ -45,7 +45,9 @@ typedef struct _DecData{
+ static void ffmpeg_init(){
+ 	static bool_t done=FALSE;
+ 	if (!done){
++#ifdef FF_API_AVCODEC_INIT
+ 		avcodec_init();
++#endif
+ 		avcodec_register_all();
+ 		done=TRUE;
+ 	}
+diff --git a/src/videoenc.c b/src/videoenc.c
+index 21d016f..fb35760 100644
+--- a/src/videoenc.c
++++ b/src/videoenc.c
+@@ -39,6 +39,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ 
+ static bool_t avcodec_initialized=FALSE;
+ 
++#ifndef FF_I_TYPE
++#define FF_I_TYPE AV_PICTURE_TYPE_I
++#endif
++
+ #ifdef ENABLE_LOG_FFMPEG
+ 
+ void ms_ffmpeg_log_callback(void* ptr, int level, const char* fmt, va_list vl)
+@@ -53,7 +57,9 @@ void ms_ffmpeg_log_callback(void* ptr, int level, const char* fmt, va_list vl)
+ 
+ void ms_ffmpeg_check_init(){
+ 	if(!avcodec_initialized){
++#ifdef FF_API_AVCODEC_INIT
+ 		avcodec_init();
++#endif
+ 		avcodec_register_all();
+ 		avcodec_initialized=TRUE;
+ #ifdef ENABLE_LOG_FFMPEG
+@@ -300,10 +306,10 @@ static void prepare_h263(EncState *s){
+ 	if (s->profile==0){
+ 		s->codec=CODEC_ID_H263;
+ 	}else{
++		/*
+ 		c->flags|=CODEC_FLAG_H263P_UMV;
+ 		c->flags|=CODEC_FLAG_AC_PRED;
+ 		c->flags|=CODEC_FLAG_H263P_SLICE_STRUCT;
+-		/*
+ 		c->flags|=CODEC_FLAG_OBMC;
+ 		c->flags|=CODEC_FLAG_AC_PRED;
+ 		*/
-- 
cgit v1.2.3-2-g168b