Sun Nov 13 23:14:59 UTC 2011

2 files changed, 71 insertions, 4 deletions

diff --git a/community/synfig/PKGBUILD b/community/synfig/PKGBUILD
index d720c5fa5..97f4111dc 100644
--- a/community/synfig/PKGBUILD
+++ b/community/synfig/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 56131 2011-10-02 08:08:49Z spupykin $
+# $Id: PKGBUILD 58423 2011-11-12 17:18:54Z ibiru $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Franco Iacomella <yaco@gnu.org>
 
 pkgname=synfig
 pkgver=0.63.02
-pkgrel=1
+pkgrel=2
 pkgdesc="Professional vector animation program (CLI renderer only)"
 arch=(i686 x86_64)
 url="http://synfig.org"
@@ -16,7 +16,7 @@ conflicts=('synfig-core')
 replaces=('synfig-core')
 options=(!libtool)
 source=(http://downloads.sourceforge.net/project/synfig/synfig/$pkgver/synfig-$pkgver.tar.gz
-	build-fix.patch)
+	build-fix.patch ffmpeg-0.8.patch)
 md5sums=('4286d5e1887275107d760d1b678aec24'
          '2de5e74159a38e4b1788c20d4c4b6f68')
 
@@ -24,7 +24,8 @@ build() {
   cd $srcdir/$pkgname-$pkgver
   [ -f configure ] || { libtoolize --ltdl --copy --force && autoreconf --install --force; }
   [ -f Makefile ] || ./configure --prefix=/usr --sysconfdir=/etc --with-libavcodec --with-libdv
-  patch -p1 <$srcdir/build-fix.patch
+  patch -p1 -i $srcdir/build-fix.patch
+  patch -Np1 -i $srcdir/ffmpeg-0.8.patch
   make
 }
 
@@ -32,3 +33,9 @@ package() {
   cd $srcdir/$pkgname-$pkgver
   make DESTDIR=$pkgdir install
 }
+md5sums=('4286d5e1887275107d760d1b678aec24'
+         '2de5e74159a38e4b1788c20d4c4b6f68'
+         'f1f22b1ce2c13e25d5eb51a664a9551f')
+md5sums=('4286d5e1887275107d760d1b678aec24'
+         '2de5e74159a38e4b1788c20d4c4b6f68'
+         'ebf41046097cfd778dee9a9854561dae')
diff --git a/community/synfig/ffmpeg-0.8.patch b/community/synfig/ffmpeg-0.8.patch
new file mode 100644
index 000000000..4ba40fff2
--- /dev/null
+++ b/community/synfig/ffmpeg-0.8.patch
@@ -0,0 +1,60 @@
+diff -aur synfig-0.63.02/src/modules/mod_libavcodec/trgt_av.cpp synfig-0.63.02.new/src/modules/mod_libavcodec/trgt_av.cpp
+--- synfig-0.63.02/src/modules/mod_libavcodec/trgt_av.cpp	2011-09-29 10:51:41.000000000 +0200
++++ synfig-0.63.02.new/src/modules/mod_libavcodec/trgt_av.cpp	2011-10-31 16:39:03.000000000 +0100
+@@ -441,7 +441,7 @@
+ 		if( context->coded_frame )
+ 			pkt.pts = context->coded_frame->pts;
+ 		if( context->coded_frame && context->coded_frame->key_frame)
+-			pkt.flags |= PKT_FLAG_KEY;
++			pkt.flags |= AV_PKT_FLAG_KEY;
+ 
+ 		//kluge for raw picture format (they said they'd fix)
+ 		if (formatc->oformat->flags & AVFMT_RAWPICTURE)
+@@ -463,7 +463,7 @@
+ 				if( context->coded_frame )
+ 					pkt.pts = context->coded_frame->pts;
+ 				if( context->coded_frame && context->coded_frame->key_frame)
+-					pkt.flags |= PKT_FLAG_KEY;
++					pkt.flags |= AV_PKT_FLAG_KEY;
+ 
+ 				ret = av_write_frame(formatc, &pkt);
+ 
+@@ -567,17 +567,17 @@
+ 		if (typestring)
+ 		{
+ 			//formatptr guess_format(type, filename, MIME type)
+-			format = guess_format(typestring,NULL,NULL);
++			format = av_guess_format(typestring,NULL,NULL);
+ 		}
+ 		else
+ 		{
+-			format = guess_format(NULL, filename, NULL);
++			format = av_guess_format(NULL, filename, NULL);
+ 		}
+ 
+ 		if(!format)
+ 		{
+ 			synfig::warning("Unable to Guess the output, defaulting to mpeg");
+-			format = guess_format("mpeg", NULL, NULL);
++			format = av_guess_format("mpeg", NULL, NULL);
+ 		}
+ 
+ 		if(!format)
+@@ -753,7 +753,7 @@
+ 
+ 		context = st->codec;
+ 		context->codec_id = (CodecID)codec_id;
+-		context->codec_type = CODEC_TYPE_VIDEO;
++		context->codec_type = AVMEDIA_TYPE_VIDEO;
+ 
+ 		//PARAMETERS MUST BE PASSED IN SOMEHOW (ANOTHER FUNCTION PARAMETER???)
+ 
+@@ -800,7 +800,7 @@
+ 
+ 		context = stream->codec;
+ 		context->codec_id = (CodecID)codec_id;
+-		context->codec_type = CODEC_TYPE_AUDIO;
++		context->codec_type = AVMEDIA_TYPE_AUDIO;
+ 
+ 		/* put sample parameters */
+ 		context->bit_rate = 64000;