[arch-commits] Commit in mediastreamer/trunk (PKGBUILD mediastreamer-ffmpeg.patch)

[Andrea Scarpino]

    Date: Saturday, June 15, 2013 @ 12:10:11
  Author: andrea
Revision: 188539

upgpkg: mediastreamer 2.9.0-1

Upstream release

Modified:
  mediastreamer/trunk/PKGBUILD
Deleted:
  mediastreamer/trunk/mediastreamer-ffmpeg.patch

----------------------------+
 PKGBUILD                   |   22 ++++++----------
 mediastreamer-ffmpeg.patch |   57 -------------------------------------------
 2 files changed, 8 insertions(+), 71 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-06-15 10:09:55 UTC (rev 188538)
+++ PKGBUILD	2013-06-15 10:10:11 UTC (rev 188539)
@@ -5,26 +5,20 @@
 # Contributor: Adrià Arrufat <swiftscythe at gmail.com>
 
 pkgname=mediastreamer
-pkgver=2.8.2
-pkgrel=5
+pkgver=2.9.0
+pkgrel=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' 'v4l-utils' 'libxv' 'libpulse')
-makedepends=('intltool')
+depends=('ortp' 'ffmpeg' 'libxv' 'glew' 'libupnp')
+# xxd from Vim is needed to build
+makedepends=('intltool' 'vim')
 options=('!libtool')
-source=("http://download-mirror.savannah.gnu.org/releases/linphone/${pkgname}/${pkgname}-${pkgver}.tar.gz"{,.sig}
-        mediastreamer-ffmpeg.patch)
-md5sums=('e51ea9d5fce1396b374d10473dfbadec'
-         '805da7def98f367e621363fa0c951fe8'
-         '553d5d47ea4a8c8dfeabdc0281849d5f')
+source=("http://download-mirror.savannah.gnu.org/releases/linphone/${pkgname}/${pkgname}-${pkgver}.tar.gz"{,.sig})
+md5sums=('f2ea0fe731a363749a81b6eaac22a62c'
+         'SKIP')
 
-prepare() {
-  cd $pkgname-$pkgver
-  patch -p1 -i "${srcdir}"/mediastreamer-ffmpeg.patch
-}
-
 build() {
   cd $pkgname-$pkgver
   ./configure --prefix=/usr

Deleted: mediastreamer-ffmpeg.patch
===================================================================
--- mediastreamer-ffmpeg.patch	2013-06-15 10:09:55 UTC (rev 188538)
+++ mediastreamer-ffmpeg.patch	2013-06-15 10:10:11 UTC (rev 188539)
@@ -1,57 +0,0 @@
-commit f586917ea4d66f9ba8910f0967a8830e54d50784
-Author: Yann Diorcet <yann.diorcet at 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;
- 		*/