Merge branch 'master' of vparabola:~/abslibre-pre-mips64el

Conflicts:
	multilib/q4wine/PKGBUILD

2 files changed, 24 insertions, 49 deletions

diff --git a/community/synfig/PKGBUILD b/community/synfig/PKGBUILD
index ce68f15bb..5d1726816 100644
--- a/community/synfig/PKGBUILD
+++ b/community/synfig/PKGBUILD
@@ -1,28 +1,34 @@
-# $Id: PKGBUILD 36102 2010-12-27 10:40:57Z spupykin $
+# $Id: PKGBUILD 49350 2011-06-14 17:04:03Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Franco Iacomella <yaco@gnu.org>
 
 pkgname=synfig
-pkgver=0.62.02
-pkgrel=1
+pkgver=0.63.00
+pkgrel=2
 pkgdesc="Professional vector animation program (CLI renderer only)"
 arch=(i686 x86_64 'mips64el')
 url="http://synfig.org"
 license=('GPL2')
-depends=('libxml++' 'libsigc++2.0' 'etl' 'imagemagick' 'ffmpeg' 'fontconfig' 'libpng' 'libtiff' 'libdv' 'libmng')
+depends=('libxml++' 'libsigc++2.0' 'etl' 'imagemagick' 'ffmpeg' 'fontconfig' 'libpng'
+	 'libtiff' 'libdv' 'libmng')
 optdepends=('openexr' 'libsigc++')
 conflicts=('synfig-core')
 replaces=('synfig-core')
 options=(!libtool)
-source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz
+source=(http://arch.p5n.pp.ru/~sergej/dl/$pkgname-$pkgver.tar.gz
 	build-fix.patch)
-md5sums=('e6af1aa9426cf629127d23edbd772f6d'
-         '0e983a00807c6c76c380f4f9918e6724')
+md5sums=('ea3633e9522ae89489519af351ba2443'
+         '2de5e74159a38e4b1788c20d4c4b6f68')
 
 build() {
-  cd $srcdir/$pkgname-$pkgver
-  [ $NOEXTRACT -eq 1 ] || patch -p1 <$srcdir/build-fix.patch
-  [ $NOEXTRACT -eq 1 ] || ./configure --prefix=/usr --sysconfdir=/etc --with-libavcodec --with-libdv
+  cd $srcdir/$pkgname-fb5ba9c/synfig-core
+  [ -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
   make
+}
+
+package() {
+  cd $srcdir/$pkgname-fb5ba9c/synfig-core
   make DESTDIR=$pkgdir install
 }
diff --git a/community/synfig/build-fix.patch b/community/synfig/build-fix.patch
index 802046dab..9124a517a 100644
--- a/community/synfig/build-fix.patch
+++ b/community/synfig/build-fix.patch
@@ -1,7 +1,7 @@
-diff -wbBur synfig-0.62.01/src/modules/mod_libavcodec/trgt_av.cpp synfig-0.62.01.my/src/modules/mod_libavcodec/trgt_av.cpp
---- synfig-0.62.01/src/modules/mod_libavcodec/trgt_av.cpp	2010-05-31 18:12:14.000000000 +0000
-+++ synfig-0.62.01.my/src/modules/mod_libavcodec/trgt_av.cpp	2010-06-03 15:56:04.000000000 +0000
-@@ -33,6 +33,10 @@
+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
  
@@ -12,7 +12,7 @@ diff -wbBur synfig-0.62.01/src/modules/mod_libavcodec/trgt_av.cpp synfig-0.62.01
  #include "trgt_av.h"
  
  extern "C"
-@@ -118,14 +122,14 @@
+@@ -116,14 +120,14 @@
      picture = avcodec_alloc_frame();
      if (!picture)
          return NULL;
@@ -29,9 +29,9 @@ diff -wbBur synfig-0.62.01/src/modules/mod_libavcodec/trgt_av.cpp synfig-0.62.01
      return picture;
  }
  
-diff -wbBur synfig-0.62.01/src/modules/mod_png/mptr_png.cpp synfig-0.62.01.my/src/modules/mod_png/mptr_png.cpp
---- synfig-0.62.01/src/modules/mod_png/mptr_png.cpp	2010-05-31 18:12:14.000000000 +0000
-+++ synfig-0.62.01.my/src/modules/mod_png/mptr_png.cpp	2010-06-03 15:43:39.000000000 +0000
+diff -wbBur synfig-core/src/modules/mod_png/mptr_png.cpp synfig-core.my/src/modules/mod_png/mptr_png.cpp
+--- synfig-core/src/modules/mod_png/mptr_png.cpp	2011-06-05 13:04:07.000000000 +0400
++++ synfig-core.my/src/modules/mod_png/mptr_png.cpp	2011-06-14 14:32:49.000000000 +0400
 @@ -309,7 +309,7 @@
  				float b=gamma().b_U8_to_F32((unsigned char)png_ptr->palette[row_pointers[y][x]].blue);
  				float a=1.0;
@@ -41,34 +41,3 @@ diff -wbBur synfig-0.62.01/src/modules/mod_png/mptr_png.cpp synfig-0.62.01.my/sr
  				surface_buffer[y][x]=Color(
  					r,
  					g,
-diff -wbBur synfig-0.62.01/src/synfig/canvas.cpp synfig-0.62.01.my/src/synfig/canvas.cpp
---- synfig-0.62.01/src/synfig/canvas.cpp	2010-05-31 18:12:14.000000000 +0000
-+++ synfig-0.62.01.my/src/synfig/canvas.cpp	2010-06-03 15:47:00.000000000 +0000
-@@ -716,7 +716,7 @@
- 	Layer::LooseHandle loose_layer(x);
- 
- 	add_connection(loose_layer,
--				   sigc::connection::connection(
-+				   sigc::connection(
- 					   x->signal_added_to_group().connect(
- 						   sigc::bind(
- 							   sigc::mem_fun(
-@@ -724,7 +724,7 @@
- 								   &Canvas::add_group_pair),
- 							   loose_layer))));
- 	add_connection(loose_layer,
--				   sigc::connection::connection(
-+				   sigc::connection(
- 					   x->signal_removed_from_group().connect(
- 						   sigc::bind(
- 							   sigc::mem_fun(
-diff -wbBur synfig-0.62.01/src/synfig/time.cpp synfig-0.62.01.my/src/synfig/time.cpp
---- synfig-0.62.01/src/synfig/time.cpp	2010-05-31 18:12:14.000000000 +0000
-+++ synfig-0.62.01.my/src/synfig/time.cpp	2010-06-03 15:43:39.000000000 +0000
-@@ -1,4 +1,6 @@
-+#include <stdio.h>
- /* === S Y N F I G ========================================================= */
-+#include <stdio.h>
- /*!	\file time.cpp
- **	\brief Template File
- **