Date: Monday, December 29, 2014 @ 14:43:29
Author: spupykin
Revision: 124828
archrelease: copy trunk to community-i686, community-x86_64
Added:
synfig/repos/community-i686/PKGBUILD
(from rev 124827, synfig/trunk/PKGBUILD)
synfig/repos/community-i686/build-fix.patch
(from rev 124827, synfig/trunk/build-fix.patch)
synfig/repos/community-i686/ffmpeg-0.8.patch
(from rev 124827, synfig/trunk/ffmpeg-0.8.patch)
synfig/repos/community-x86_64/PKGBUILD
(from rev 124827, synfig/trunk/PKGBUILD)
synfig/repos/community-x86_64/build-fix.patch
(from rev 124827, synfig/trunk/build-fix.patch)
synfig/repos/community-x86_64/ffmpeg-0.8.patch
(from rev 124827, synfig/trunk/ffmpeg-0.8.patch)
Deleted:
synfig/repos/community-i686/PKGBUILD
synfig/repos/community-i686/build-fix.patch
synfig/repos/community-i686/ffmpeg-0.8.patch
synfig/repos/community-x86_64/PKGBUILD
synfig/repos/community-x86_64/build-fix.patch
synfig/repos/community-x86_64/ffmpeg-0.8.patch
-----------------------------------+
/PKGBUILD | 92 +++++++++++++++++++++++++++
/build-fix.patch | 62 ++++++++++++++++++
/ffmpeg-0.8.patch | 120 ++++++++++++++++++++++++++++++++++++
community-i686/PKGBUILD | 46 -------------
community-i686/build-fix.patch | 31 ---------
community-i686/ffmpeg-0.8.patch | 60 ------------------
community-x86_64/PKGBUILD | 46 -------------
community-x86_64/build-fix.patch | 31 ---------
community-x86_64/ffmpeg-0.8.patch | 60 ------------------
9 files changed, 274 insertions(+), 274 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2014-12-29 13:43:10 UTC (rev 124827)
+++ community-i686/PKGBUILD 2014-12-29 13:43:29 UTC (rev 124828)
@@ -1,46 +0,0 @@
-# $Id$
-# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com>
-# Contributor: Franco Iacomella <y...@gnu.org>
-
-pkgname=synfig
-pkgver=0.64.2
-pkgrel=1
-pkgdesc="Professional vector animation program (CLI renderer only)"
-arch=(i686 x86_64)
-url="http://synfig.org";
-license=('GPL2')
-depends=('libxml++' 'libsigc++2.0' 'etl' 'imagemagick' 'ffmpeg-compat'
'fontconfig' 'libpng'
- 'libtiff' 'libdv' 'libmng' 'cairo' 'pango' 'boost-libs')
-makedepends=('boost')
-optdepends=('openexr' 'libsigc++')
-conflicts=('synfig-core')
-replaces=('synfig-core')
-source=(http://downloads.sourceforge.net/project/synfig/releases/$pkgver/source/synfig-$pkgver.tar.gz
- build-fix.patch
- ffmpeg-0.8.patch)
-md5sums=('6ac9536e4d0a584d57e64a8eca38e6c3'
- 'b5568b06fae1a7ee465b5380b1139b83'
- 'ebf41046097cfd778dee9a9854561dae')
-
-prepare() {
- cd $pkgname-$pkgver
- patch -p1 -i "$srcdir/build-fix.patch"
- patch -Np1 -i "$srcdir/ffmpeg-0.8.patch"
- sed -i 's|.*set_remove_alpha.*||g' src/modules/mod_libavcodec/trgt_av.cpp
-}
-
-build() {
- cd $pkgname-$pkgver
- export PKG_CONFIG_PATH=/usr/lib/ffmpeg-compat/pkgconfig:$PKG_CONFIG_PATH
- LDFLAGS="$LDFLAGS -Wl,-rpath -Wl,/usr/lib/ffmpeg-compat"
- CFLAGS="$CFLAGS -D__STDC_CONSTANT_MACROS"
- CXXFLAGS="$CXXFLAGS -D__STDC_CONSTANT_MACROS"
- [ -f configure ] || { libtoolize --ltdl --copy --force && autoreconf
--install --force; }
- [ -f Makefile ] || ./configure --prefix=/usr --sysconfdir=/etc
--with-libavcodec --with-libdv
- make
-}
-
-package() {
- cd $pkgname-$pkgver
- make DESTDIR="$pkgdir" install
-}
Copied: synfig/repos/community-i686/PKGBUILD (from rev 124827,
synfig/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2014-12-29 13:43:29 UTC (rev 124828)
@@ -0,0 +1,46 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com>
+# Contributor: Franco Iacomella <y...@gnu.org>
+
+pkgname=synfig
+pkgver=0.64.3
+pkgrel=1
+pkgdesc="Professional vector animation program (CLI renderer only)"
+arch=(i686 x86_64)
+url="http://synfig.org";
+license=('GPL2')
+depends=('libxml++' 'libsigc++2.0' 'etl' 'imagemagick' 'ffmpeg-compat'
'fontconfig' 'libpng'
+ 'libtiff' 'libdv' 'libmng' 'cairo' 'pango' 'boost-libs')
+makedepends=('boost')
+optdepends=('openexr' 'libsigc++')
+conflicts=('synfig-core')
+replaces=('synfig-core')
+source=(http://downloads.sourceforge.net/project/synfig/releases/$pkgver/source/synfig-$pkgver.tar.gz
+ build-fix.patch
+ ffmpeg-0.8.patch)
+md5sums=('294904f9b976c62d7b5473134dbb9dfa'
+ 'b5568b06fae1a7ee465b5380b1139b83'
+ 'ebf41046097cfd778dee9a9854561dae')
+
+prepare() {
+ cd $pkgname-$pkgver
+ patch -p1 -i "$srcdir/build-fix.patch"
+ patch -Np1 -i "$srcdir/ffmpeg-0.8.patch"
+ sed -i 's|.*set_remove_alpha.*||g' src/modules/mod_libavcodec/trgt_av.cpp
+}
+
+build() {
+ cd $pkgname-$pkgver
+ export PKG_CONFIG_PATH=/usr/lib/ffmpeg-compat/pkgconfig:$PKG_CONFIG_PATH
+ LDFLAGS="$LDFLAGS -Wl,-rpath -Wl,/usr/lib/ffmpeg-compat"
+ CFLAGS="$CFLAGS -D__STDC_CONSTANT_MACROS"
+ CXXFLAGS="$CXXFLAGS -D__STDC_CONSTANT_MACROS"
+ [ -f configure ] || { libtoolize --ltdl --copy --force && autoreconf
--install --force; }
+ [ -f Makefile ] || ./configure --prefix=/usr --sysconfdir=/etc
--with-libavcodec --with-libdv
+ make
+}
+
+package() {
+ cd $pkgname-$pkgver
+ make DESTDIR="$pkgdir" install
+}
Deleted: community-i686/build-fix.patch
===================================================================
--- community-i686/build-fix.patch 2014-12-29 13:43:10 UTC (rev 124827)
+++ community-i686/build-fix.patch 2014-12-29 13:43:29 UTC (rev 124828)
@@ -1,31 +0,0 @@
-diff -wbBur synfig-core/src/modules/mod_libavcodec/trgt_av.cpp
synfig-core.my/src/modules/mod_libavcodec/trgt_av.cpp
---- synfig-core/src/modules/mod_libavcodec/trgt_av.cpp 2011-06-05
13:04:07.000000000 +0400
-+++ synfig-core.my/src/modules/mod_libavcodec/trgt_av.cpp 2011-06-14
14:32:49.000000000 +0400
-@@ -31,6 +31,10 @@
- # include <config.h>
- #endif
-
-+#include <libavcodec/avcodec.h>
-+#include <libavformat/avformat.h>
-+#include <libswscale/swscale.h>
-+
- #include "trgt_av.h"
-
- extern "C"
-@@ -116,14 +120,14 @@
- picture = avcodec_alloc_frame();
- if (!picture)
- return NULL;
-- size = avpicture_get_size(pix_fmt, width, height);
-+ size = avpicture_get_size((enum ::PixelFormat)pix_fmt, width, height);
- picture_buf = (uint8_t *)malloc(size);
- if (!picture_buf) {
- av_free(picture);
- return NULL;
- }
- avpicture_fill((AVPicture *)picture, picture_buf,
-- pix_fmt, width, height);
-+ (enum ::PixelFormat)pix_fmt, width, height);
- return picture;
- }
-
Copied: synfig/repos/community-i686/build-fix.patch (from rev 124827,
synfig/trunk/build-fix.patch)
===================================================================
--- community-i686/build-fix.patch (rev 0)
+++ community-i686/build-fix.patch 2014-12-29 13:43:29 UTC (rev 124828)
@@ -0,0 +1,31 @@
+diff -wbBur synfig-core/src/modules/mod_libavcodec/trgt_av.cpp
synfig-core.my/src/modules/mod_libavcodec/trgt_av.cpp
+--- synfig-core/src/modules/mod_libavcodec/trgt_av.cpp 2011-06-05
13:04:07.000000000 +0400
++++ synfig-core.my/src/modules/mod_libavcodec/trgt_av.cpp 2011-06-14
14:32:49.000000000 +0400
+@@ -31,6 +31,10 @@
+ # include <config.h>
+ #endif
+
++#include <libavcodec/avcodec.h>
++#include <libavformat/avformat.h>
++#include <libswscale/swscale.h>
++
+ #include "trgt_av.h"
+
+ extern "C"
+@@ -116,14 +120,14 @@
+ picture = avcodec_alloc_frame();
+ if (!picture)
+ return NULL;
+- size = avpicture_get_size(pix_fmt, width, height);
++ size = avpicture_get_size((enum ::PixelFormat)pix_fmt, width, height);
+ picture_buf = (uint8_t *)malloc(size);
+ if (!picture_buf) {
+ av_free(picture);
+ return NULL;
+ }
+ avpicture_fill((AVPicture *)picture, picture_buf,
+- pix_fmt, width, height);
++ (enum ::PixelFormat)pix_fmt, width, height);
+ return picture;
+ }
+
Deleted: community-i686/ffmpeg-0.8.patch
===================================================================
--- community-i686/ffmpeg-0.8.patch 2014-12-29 13:43:10 UTC (rev 124827)
+++ community-i686/ffmpeg-0.8.patch 2014-12-29 13:43:29 UTC (rev 124828)
@@ -1,60 +0,0 @@
-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;
Copied: synfig/repos/community-i686/ffmpeg-0.8.patch (from rev 124827,
synfig/trunk/ffmpeg-0.8.patch)
===================================================================
--- community-i686/ffmpeg-0.8.patch (rev 0)
+++ community-i686/ffmpeg-0.8.patch 2014-12-29 13:43:29 UTC (rev 124828)
@@ -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;
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2014-12-29 13:43:10 UTC (rev 124827)
+++ community-x86_64/PKGBUILD 2014-12-29 13:43:29 UTC (rev 124828)
@@ -1,46 +0,0 @@
-# $Id$
-# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com>
-# Contributor: Franco Iacomella <y...@gnu.org>
-
-pkgname=synfig
-pkgver=0.64.2
-pkgrel=1
-pkgdesc="Professional vector animation program (CLI renderer only)"
-arch=(i686 x86_64)
-url="http://synfig.org";
-license=('GPL2')
-depends=('libxml++' 'libsigc++2.0' 'etl' 'imagemagick' 'ffmpeg-compat'
'fontconfig' 'libpng'
- 'libtiff' 'libdv' 'libmng' 'cairo' 'pango' 'boost-libs')
-makedepends=('boost')
-optdepends=('openexr' 'libsigc++')
-conflicts=('synfig-core')
-replaces=('synfig-core')
-source=(http://downloads.sourceforge.net/project/synfig/releases/$pkgver/source/synfig-$pkgver.tar.gz
- build-fix.patch
- ffmpeg-0.8.patch)
-md5sums=('6ac9536e4d0a584d57e64a8eca38e6c3'
- 'b5568b06fae1a7ee465b5380b1139b83'
- 'ebf41046097cfd778dee9a9854561dae')
-
-prepare() {
- cd $pkgname-$pkgver
- patch -p1 -i "$srcdir/build-fix.patch"
- patch -Np1 -i "$srcdir/ffmpeg-0.8.patch"
- sed -i 's|.*set_remove_alpha.*||g' src/modules/mod_libavcodec/trgt_av.cpp
-}
-
-build() {
- cd $pkgname-$pkgver
- export PKG_CONFIG_PATH=/usr/lib/ffmpeg-compat/pkgconfig:$PKG_CONFIG_PATH
- LDFLAGS="$LDFLAGS -Wl,-rpath -Wl,/usr/lib/ffmpeg-compat"
- CFLAGS="$CFLAGS -D__STDC_CONSTANT_MACROS"
- CXXFLAGS="$CXXFLAGS -D__STDC_CONSTANT_MACROS"
- [ -f configure ] || { libtoolize --ltdl --copy --force && autoreconf
--install --force; }
- [ -f Makefile ] || ./configure --prefix=/usr --sysconfdir=/etc
--with-libavcodec --with-libdv
- make
-}
-
-package() {
- cd $pkgname-$pkgver
- make DESTDIR="$pkgdir" install
-}
Copied: synfig/repos/community-x86_64/PKGBUILD (from rev 124827,
synfig/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2014-12-29 13:43:29 UTC (rev 124828)
@@ -0,0 +1,46 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com>
+# Contributor: Franco Iacomella <y...@gnu.org>
+
+pkgname=synfig
+pkgver=0.64.3
+pkgrel=1
+pkgdesc="Professional vector animation program (CLI renderer only)"
+arch=(i686 x86_64)
+url="http://synfig.org";
+license=('GPL2')
+depends=('libxml++' 'libsigc++2.0' 'etl' 'imagemagick' 'ffmpeg-compat'
'fontconfig' 'libpng'
+ 'libtiff' 'libdv' 'libmng' 'cairo' 'pango' 'boost-libs')
+makedepends=('boost')
+optdepends=('openexr' 'libsigc++')
+conflicts=('synfig-core')
+replaces=('synfig-core')
+source=(http://downloads.sourceforge.net/project/synfig/releases/$pkgver/source/synfig-$pkgver.tar.gz
+ build-fix.patch
+ ffmpeg-0.8.patch)
+md5sums=('294904f9b976c62d7b5473134dbb9dfa'
+ 'b5568b06fae1a7ee465b5380b1139b83'
+ 'ebf41046097cfd778dee9a9854561dae')
+
+prepare() {
+ cd $pkgname-$pkgver
+ patch -p1 -i "$srcdir/build-fix.patch"
+ patch -Np1 -i "$srcdir/ffmpeg-0.8.patch"
+ sed -i 's|.*set_remove_alpha.*||g' src/modules/mod_libavcodec/trgt_av.cpp
+}
+
+build() {
+ cd $pkgname-$pkgver
+ export PKG_CONFIG_PATH=/usr/lib/ffmpeg-compat/pkgconfig:$PKG_CONFIG_PATH
+ LDFLAGS="$LDFLAGS -Wl,-rpath -Wl,/usr/lib/ffmpeg-compat"
+ CFLAGS="$CFLAGS -D__STDC_CONSTANT_MACROS"
+ CXXFLAGS="$CXXFLAGS -D__STDC_CONSTANT_MACROS"
+ [ -f configure ] || { libtoolize --ltdl --copy --force && autoreconf
--install --force; }
+ [ -f Makefile ] || ./configure --prefix=/usr --sysconfdir=/etc
--with-libavcodec --with-libdv
+ make
+}
+
+package() {
+ cd $pkgname-$pkgver
+ make DESTDIR="$pkgdir" install
+}
Deleted: community-x86_64/build-fix.patch
===================================================================
--- community-x86_64/build-fix.patch 2014-12-29 13:43:10 UTC (rev 124827)
+++ community-x86_64/build-fix.patch 2014-12-29 13:43:29 UTC (rev 124828)
@@ -1,31 +0,0 @@
-diff -wbBur synfig-core/src/modules/mod_libavcodec/trgt_av.cpp
synfig-core.my/src/modules/mod_libavcodec/trgt_av.cpp
---- synfig-core/src/modules/mod_libavcodec/trgt_av.cpp 2011-06-05
13:04:07.000000000 +0400
-+++ synfig-core.my/src/modules/mod_libavcodec/trgt_av.cpp 2011-06-14
14:32:49.000000000 +0400
-@@ -31,6 +31,10 @@
- # include <config.h>
- #endif
-
-+#include <libavcodec/avcodec.h>
-+#include <libavformat/avformat.h>
-+#include <libswscale/swscale.h>
-+
- #include "trgt_av.h"
-
- extern "C"
-@@ -116,14 +120,14 @@
- picture = avcodec_alloc_frame();
- if (!picture)
- return NULL;
-- size = avpicture_get_size(pix_fmt, width, height);
-+ size = avpicture_get_size((enum ::PixelFormat)pix_fmt, width, height);
- picture_buf = (uint8_t *)malloc(size);
- if (!picture_buf) {
- av_free(picture);
- return NULL;
- }
- avpicture_fill((AVPicture *)picture, picture_buf,
-- pix_fmt, width, height);
-+ (enum ::PixelFormat)pix_fmt, width, height);
- return picture;
- }
-
Copied: synfig/repos/community-x86_64/build-fix.patch (from rev 124827,
synfig/trunk/build-fix.patch)
===================================================================
--- community-x86_64/build-fix.patch (rev 0)
+++ community-x86_64/build-fix.patch 2014-12-29 13:43:29 UTC (rev 124828)
@@ -0,0 +1,31 @@
+diff -wbBur synfig-core/src/modules/mod_libavcodec/trgt_av.cpp
synfig-core.my/src/modules/mod_libavcodec/trgt_av.cpp
+--- synfig-core/src/modules/mod_libavcodec/trgt_av.cpp 2011-06-05
13:04:07.000000000 +0400
++++ synfig-core.my/src/modules/mod_libavcodec/trgt_av.cpp 2011-06-14
14:32:49.000000000 +0400
+@@ -31,6 +31,10 @@
+ # include <config.h>
+ #endif
+
++#include <libavcodec/avcodec.h>
++#include <libavformat/avformat.h>
++#include <libswscale/swscale.h>
++
+ #include "trgt_av.h"
+
+ extern "C"
+@@ -116,14 +120,14 @@
+ picture = avcodec_alloc_frame();
+ if (!picture)
+ return NULL;
+- size = avpicture_get_size(pix_fmt, width, height);
++ size = avpicture_get_size((enum ::PixelFormat)pix_fmt, width, height);
+ picture_buf = (uint8_t *)malloc(size);
+ if (!picture_buf) {
+ av_free(picture);
+ return NULL;
+ }
+ avpicture_fill((AVPicture *)picture, picture_buf,
+- pix_fmt, width, height);
++ (enum ::PixelFormat)pix_fmt, width, height);
+ return picture;
+ }
+
Deleted: community-x86_64/ffmpeg-0.8.patch
===================================================================
--- community-x86_64/ffmpeg-0.8.patch 2014-12-29 13:43:10 UTC (rev 124827)
+++ community-x86_64/ffmpeg-0.8.patch 2014-12-29 13:43:29 UTC (rev 124828)
@@ -1,60 +0,0 @@
-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;
Copied: synfig/repos/community-x86_64/ffmpeg-0.8.patch (from rev 124827,
synfig/trunk/ffmpeg-0.8.patch)
===================================================================
--- community-x86_64/ffmpeg-0.8.patch (rev 0)
+++ community-x86_64/ffmpeg-0.8.patch 2014-12-29 13:43:29 UTC (rev 124828)
@@ -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;
