Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/pigeonhole/PKGBUILD
	community/pv/PKGBUILD
	community/python-gnupginterface/PKGBUILD
	community/tdl/PKGBUILD
	extra/clisp/PKGBUILD
	extra/expect/PKGBUILD
	extra/gtkpod/PKGBUILD
	extra/hspell/PKGBUILD
	extra/id3lib/PKGBUILD
	extra/imake/PKGBUILD
	extra/libfontenc/PKGBUILD
	extra/libice/PKGBUILD
	extra/libsm/PKGBUILD
	extra/libspectre/PKGBUILD
	extra/libtasn1/PKGBUILD
	extra/libxau/PKGBUILD
	extra/libxaw/PKGBUILD
	extra/libxxf86dga/PKGBUILD
	extra/mp3splt/PKGBUILD
	extra/multitail/PKGBUILD
	extra/nss_ldap/PKGBUILD
	extra/pam_ldap/PKGBUILD
	extra/recode/PKGBUILD
	extra/ruby/PKGBUILD
	extra/squid/PKGBUILD
	extra/ssmtp/PKGBUILD
	extra/umfpack/PKGBUILD
	extra/xorg-xbacklight/PKGBUILD
	extra/xorg-xbiff/PKGBUILD
	extra/xorg-xcalc/PKGBUILD
	extra/xorg-xconsole/PKGBUILD
	extra/xorg-xedit/PKGBUILD
	extra/xorg-xeyes/PKGBUILD
	extra/xorg-xvinfo/PKGBUILD

2 files changed, 79 insertions, 3 deletions

diff --git a/community/paraview/PKGBUILD b/community/paraview/PKGBUILD
index 43fa10053..3e55bf594 100644
--- a/community/paraview/PKGBUILD
+++ b/community/paraview/PKGBUILD
@@ -4,12 +4,14 @@
 
 pkgname=paraview
 pkgver=3.14.0
-pkgrel=1
+pkgrel=2
 pkgdesc='Parallel Visualization Application using VTK'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.paraview.org'
 license=('custom')
 depends=('qt' 'python2' 'libgl' 'unixodbc' 'postgresql-libs' 'libxt' 'qtwebkit' 'libmysqlclient' 'mesa' 'openmpi' 'boost-libs' 'libcgns2'
+         # export as avi support
+         'ffmpeg'
          # The following is a list of libraries we explicitly tell cmake to use the system library of
          'hdf5' 'freetype2' 'libjpeg' 'libpng' 'libtiff' 'zlib' 'expat' 'libxml2' 'libtheora'
         )
@@ -17,17 +19,24 @@ makedepends=('cmake' 'desktop-file-utils' 'boost')
 source=("http://paraview.org/files/v${pkgver:0:4}/ParaView-${pkgver}-Source.tar.gz"
         'paraview.png'
         'paraview.desktop'
-        'fix-build-with-zlib-1.2.6.diff')
+        'fix-build-with-zlib-1.2.6.diff'
+        'ffmpeg-0.8.diff')
 md5sums=('a260bd891fd75d0e276a581a3603edff'
          'db623002bc71a257ddfdd0c9c7b14c3f'
          '4e4b7172ed18171c37446fd7c4f1e8f5'
-         'e4506b4ed0d2ae60072388f098be6c33')
+         'e4506b4ed0d2ae60072388f098be6c33'
+         'e992321c9d1def6034d0fa6607b40c5a')
 
 build() {
   cd ${srcdir}/ParaView-${pkgver}-Source
+
   # fix http://paraview.org/Bug/view.php?id=12924
   patch -Np0 -i ${srcdir}/fix-build-with-zlib-1.2.6.diff
 
+  # fix http://www.vtk.org/Bug/view.php?id=12691
+  cd VTK
+  patch -Np1 -i ${srcdir}/ffmpeg-0.8.diff
+
   mkdir ${srcdir}/build
   cd ${srcdir}/build
 
@@ -53,6 +62,7 @@ build() {
     -DPARAVIEW_BUILD_QT_GUI:BOOL=ON \
     -DPARAVIEW_USE_VISITBRIDGE:BOOL=ON \
     -DVISIT_BUILD_READER_CGNS:BOOL=ON \
+    -DVTK_USE_FFMPEG_ENCODER:BOOL=ON \
     ${cmake_system_flags} \
     ${cmake_system_python_flags} \
     ../ParaView-${pkgver}-Source
diff --git a/community/paraview/ffmpeg-0.8.diff b/community/paraview/ffmpeg-0.8.diff
new file mode 100644
index 000000000..523919d6f
--- /dev/null
+++ b/community/paraview/ffmpeg-0.8.diff
@@ -0,0 +1,66 @@
+Description: Upstream changes introduced in version 5.6.1-6.1
+ This patch has been created by dpkg-source during the package build.
+ Here's the last changelog entry, hopefully it gives details on why
+ those changes were made:
+ .
+ vtk (5.6.1-6.1) unstable; urgency=low
+ .
+   [ Michael Schutte ]
+   * Non-maintainer upload.
+   * Remove absolute paths to required libraries from
+     /usr/lib/vtk-5.6/VTKLibraryDepends.cmake after building, closes:
+     #506992.  Due to the multiarch transition, the original behavior
+     frequently causes reverse build-deps to FTBFS.  This change should
+     probably be reverted once all required libraries are multiarched.
+ .
+   [ Steve M. Robbins ]
+   * Override lintian diagnostic about embedded libraries ftgl and sqlite.
+   * IO/vtkFFMPEGWriter.cxx: Applied fix from #638246 to build with libav
+     0.7.
+ .
+ The person named in the Author field signed this changelog entry.
+Author: Steve M. Robbins <smr@debian.org>
+Bug-Debian: http://bugs.debian.org/506992
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: http://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+--- vtk-5.6.1.orig/IO/vtkFFMPEGWriter.cxx
++++ vtk-5.6.1/IO/vtkFFMPEGWriter.cxx
+@@ -123,7 +123,7 @@ int vtkFFMPEGWriterInternal::Start()
+     }
+ 
+   //choose avi media file format
+-  this->avOutputFormat = guess_format("avi", NULL, NULL);
++  this->avOutputFormat = av_guess_format("avi", NULL, NULL);
+   if (!this->avOutputFormat) 
+     {
+     vtkGenericWarningMacro (<< "Could not open the avi media file format.");
+@@ -150,7 +150,7 @@ int vtkFFMPEGWriterInternal::Start()
+   //Set up the codec.
+   AVCodecContext *c = this->avStream->codec;
+   c->codec_id = (CodecID)this->avOutputFormat->video_codec;
+-  c->codec_type = CODEC_TYPE_VIDEO;
++  c->codec_type = AVMEDIA_TYPE_VIDEO;
+   c->width = this->Dim[0];
+   c->height = this->Dim[1];
+   c->pix_fmt = PIX_FMT_YUVJ420P;
+@@ -329,7 +329,7 @@ int vtkFFMPEGWriterInternal::Write(vtkIm
+     pkt.stream_index = this->avStream->index;
+     if (cc->coded_frame->key_frame) //treat keyframes well
+       {
+-      pkt.flags |= PKT_FLAG_KEY;
++      pkt.flags |= AV_PKT_FLAG_KEY;
+       }
+     pkt.duration = 0; //presentation duration in time_base units or 0 if NA
+     pkt.pos = -1; //byte position in stream or -1 if NA