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

[Sergej Pupykin]

    Date: Wednesday, November 19, 2014 @ 19:17:15
  Author: spupykin
Revision: 122777

Modified:
  synfig/trunk/PKGBUILD
Deleted:
  synfig/trunk/ffmpeg-loop.patch

-------------------+
 PKGBUILD          |   15 +++++--------
 ffmpeg-loop.patch |   56 ----------------------------------------------------
 2 files changed, 6 insertions(+), 65 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-11-19 18:17:01 UTC (rev 122776)
+++ PKGBUILD	2014-11-19 18:17:15 UTC (rev 122777)
@@ -3,8 +3,8 @@
 # Contributor: Franco Iacomella <yaco at gnu.org>
 
 pkgname=synfig
-pkgver=0.64.1
-pkgrel=11
+pkgver=0.64.2
+pkgrel=1
 pkgdesc="Professional vector animation program (CLI renderer only)"
 arch=(i686 x86_64)
 url="http://synfig.org"
@@ -17,19 +17,16 @@
 replaces=('synfig-core')
 source=(http://downloads.sourceforge.net/project/synfig/releases/$pkgver/source/synfig-$pkgver.tar.gz
 	build-fix.patch
-	ffmpeg-0.8.patch
-	ffmpeg-loop.patch)
-md5sums=('548a5d51a48b2be0c3fcaebe917a5d88'
+	ffmpeg-0.8.patch)
+md5sums=('6ac9536e4d0a584d57e64a8eca38e6c3'
          'b5568b06fae1a7ee465b5380b1139b83'
-         'ebf41046097cfd778dee9a9854561dae'
-         'c6684c876c093f5e53d2c46592994e9b')
+         'ebf41046097cfd778dee9a9854561dae')
 
 prepare() {
   cd $pkgname-$pkgver
   patch -p1 -i "$srcdir/build-fix.patch"
   patch -Np1 -i "$srcdir/ffmpeg-0.8.patch"
-#  patch -Np1 -i "$srcdir/ffmpeg-loop.patch"
-  sed -i '1,1i#include <string.h>' src/modules/mod_png/trgt_png.cpp
+  sed -i 's|.*set_remove_alpha.*||g' src/modules/mod_libavcodec/trgt_av.cpp
 }
 
 build() {

Deleted: ffmpeg-loop.patch
===================================================================
--- ffmpeg-loop.patch	2014-11-19 18:17:01 UTC (rev 122776)
+++ ffmpeg-loop.patch	2014-11-19 18:17:15 UTC (rev 122777)
@@ -1,56 +0,0 @@
---- synfig-0.63.05/src/modules/mod_ffmpeg/trgt_ffmpeg.cpp	2013-02-27 13:51:18.638547204 -0300
-+++ synfig-0.63.05.new/src/modules/mod_ffmpeg/trgt_ffmpeg.cpp	2013-02-27 13:51:09.905261183 -0300
-@@ -172,7 +172,7 @@
- 
- 	if( filename.c_str()[0] == '-' )
- 		command = strprintf("ffmpeg -f image2pipe -vcodec ppm -an"
--							" -r %f -i pipe: -loop_input"
-+							" -r %f -i pipe: -loop 1"
- 							" -metadata title=\"%s\" "
- 							" -vcodec %s -b %ik"
- 							" -y -- \"%s\"\n",
-@@ -182,7 +182,7 @@
- 							filename.c_str());
- 	else
- 		command = strprintf("ffmpeg -f image2pipe -vcodec ppm -an"
--							" -r %f -i pipe: -loop_input"
-+							" -r %f -i pipe: -loop 1"
- 							" -metadata title=\"%s\" "
- 							"-vcodec %s -b %ik"
- 							" -y -- \"%s\"\n",
-@@ -227,7 +227,7 @@
- 				execlp("ffmpeg", "ffmpeg", "-f", "image2pipe", "-vcodec",
- 					   "ppm", "-an", "-r",
- 					   strprintf("%f", desc.get_frame_rate()).c_str(),
--					   "-i", "pipe:", "-loop_input", "-metadata",
-+					   "-i", "pipe:", "-loop", "1", "-metadata",
- 						strprintf("title=\"%s\"", get_canvas()->get_name().c_str()).c_str(),
- 						"-vcodec", video_codec.c_str(),
- 						"-b", strprintf("%ik", bitrate).c_str(),
-@@ -237,7 +237,7 @@
- 				execlp("ffmpeg", "ffmpeg", "-f", "image2pipe", "-vcodec",
- 					   "ppm", "-an", "-r",
- 					   strprintf("%f", desc.get_frame_rate()).c_str(),
--					   "-i", "pipe:", "-loop_input", "-metadata",
-+					   "-i", "pipe:", "-loop", "1", "-metadata",
- 						strprintf("title=\"%s\"", get_canvas()->get_name().c_str()).c_str(),
- 						"-vcodec", video_codec.c_str(),
- 						"-b", strprintf("%ik", bitrate).c_str(),
-@@ -249,7 +249,7 @@
- 				execlp("ffmpeg", "ffmpeg", "-f", "image2pipe", "-vcodec",
- 					   "ppm", "-an", "-r",
- 					   strprintf("%f", desc.get_frame_rate()).c_str(),
--					   "-i", "pipe:", "-loop_input",
-+					   "-i", "pipe:", "-loop", "1",
- 					   "-metadata",
- 					   strprintf("title=\"%s\"", get_canvas()->get_name().c_str()).c_str(),
- 					   "-vcodec", video_codec.c_str(),
-@@ -260,7 +260,7 @@
- 				execlp("ffmpeg", "ffmpeg", "-f", "image2pipe", "-vcodec",
- 					   "ppm", "-an", "-r",
- 					   strprintf("%f", desc.get_frame_rate()).c_str(),
--					   "-i", "pipe:", "-loop_input",
-+					   "-i", "pipe:", "-loop", "1",
- 					   "-metadata",
- 					   strprintf("title=\"%s\"", get_canvas()->get_name().c_str()).c_str(),
- 					   "-vcodec", video_codec.c_str(),