[arch-commits] Commit in synfig/trunk (PKGBUILD build-fix.patch)

[Sergej Pupykin]

    Date: Tuesday, April 28, 2015 @ 16:34:05
  Author: spupykin
Revision: 132456

upgpkg: synfig 1.0-3

upd

Modified:
  synfig/trunk/PKGBUILD
  synfig/trunk/build-fix.patch

-----------------+
 PKGBUILD        |   10 +++++-----
 build-fix.patch |   45 ++++++++++++++++++++++++++++++---------------
 2 files changed, 35 insertions(+), 20 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-04-28 14:34:01 UTC (rev 132455)
+++ PKGBUILD	2015-04-28 14:34:05 UTC (rev 132456)
@@ -10,7 +10,7 @@
 url="http://synfig.org"
 license=('GPL2')
 depends=('libxml++' 'libsigc++2.0' 'etl' 'imagemagick' 'ffmpeg-compat' 'fontconfig' 'libpng'
-	 'libtiff' 'libdv' 'libmng' 'cairo' 'pango' 'boost-libs')
+	 'libtiff' 'libdv' 'libmng' 'cairo' 'pango' 'boost-libs' 'mlt')
 makedepends=('boost')
 optdepends=('openexr' 'libsigc++')
 conflicts=('synfig-core')
@@ -19,11 +19,11 @@
 	build-fix.patch
 	ffmpeg-0.8.patch)
 md5sums=('b691108c2870505b5babf83340fd0eba'
-         'b5568b06fae1a7ee465b5380b1139b83'
+         '6d5277b28a3ba531e3e53e4a1f810fa7'
          'ebf41046097cfd778dee9a9854561dae')
 
 prepare() {
-  cd $pkgname-$pkgver
+  cd $pkgname-$pkgver-RC5
   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
@@ -30,7 +30,7 @@
 }
 
 build() {
-  cd $pkgname-$pkgver
+  cd $pkgname-$pkgver-RC5
   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"
@@ -41,6 +41,6 @@
 }
 
 package() {
-  cd $pkgname-$pkgver
+  cd $pkgname-$pkgver-RC5
   make DESTDIR="$pkgdir" install
 }

Modified: build-fix.patch
===================================================================
--- build-fix.patch	2015-04-28 14:34:01 UTC (rev 132455)
+++ build-fix.patch	2015-04-28 14:34:05 UTC (rev 132456)
@@ -1,23 +1,38 @@
-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
+diff -wbBur synfig-1.0-RC5/src/modules/mod_libavcodec/mptr.cpp synfig-1.0-RC5.my/src/modules/mod_libavcodec/mptr.cpp
+--- synfig-1.0-RC5/src/modules/mod_libavcodec/mptr.cpp	2015-03-28 13:15:00.000000000 +0300
++++ synfig-1.0-RC5.my/src/modules/mod_libavcodec/mptr.cpp	2015-04-28 16:56:11.568749053 +0300
+@@ -56,8 +56,8 @@
+ /* === M E T H O D S ======================================================= */
  
-+#include <libavcodec/avcodec.h>
-+#include <libavformat/avformat.h>
-+#include <libswscale/swscale.h>
-+
- #include "trgt_av.h"
  
- extern "C"
-@@ -116,14 +120,14 @@
+-Importer_LibAVCodec::Importer_LibAVCodec(const char *file):
+-	filename(file)
++Importer_LibAVCodec::Importer_LibAVCodec(const synfig::FileSystem::Identifier &identifier):
++	Importer(identifier)
+ {
+ }
+ 
+diff -wbBur synfig-1.0-RC5/src/modules/mod_libavcodec/mptr.h synfig-1.0-RC5.my/src/modules/mod_libavcodec/mptr.h
+--- synfig-1.0-RC5/src/modules/mod_libavcodec/mptr.h	2015-03-28 13:15:00.000000000 +0300
++++ synfig-1.0-RC5.my/src/modules/mod_libavcodec/mptr.h	2015-04-28 16:55:18.699192946 +0300
+@@ -46,7 +46,7 @@
+ 	synfig::String filename;
+ 
+ public:
+-	Importer_LibAVCodec(const char *filename);
++	Importer_LibAVCodec(const synfig::FileSystem::Identifier &identifier);
+ 	~Importer_LibAVCodec();
+ 
+ 	virtual bool get_frame(synfig::Surface &surface, const synfig::RendDesc &renddesc, synfig::Time time, synfig::ProgressCallback *callback);
+diff -wbBur synfig-1.0-RC5/src/modules/mod_libavcodec/trgt_av.cpp synfig-1.0-RC5.my/src/modules/mod_libavcodec/trgt_av.cpp
+--- synfig-1.0-RC5/src/modules/mod_libavcodec/trgt_av.cpp	2015-03-28 13:15:00.000000000 +0300
++++ synfig-1.0-RC5.my/src/modules/mod_libavcodec/trgt_av.cpp	2015-04-28 16:46:54.720091106 +0300
+@@ -121,14 +121,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);
++    size = avpicture_get_size((::PixelFormat)pix_fmt, width, height);
      picture_buf = (uint8_t *)malloc(size);
      if (!picture_buf) {
          av_free(picture);
@@ -25,7 +40,7 @@
      }
      avpicture_fill((AVPicture *)picture, picture_buf,
 -                   pix_fmt, width, height);
-+                   (enum ::PixelFormat)pix_fmt, width, height);
++                   (::PixelFormat)pix_fmt, width, height);
      return picture;
  }