Date: Tuesday, March 18, 2014 @ 12:07:18
Author: fyan
Revision: 107625
archrelease: copy trunk to community-staging-i686, community-staging-x86_64
Added:
python-matplotlib/repos/community-staging-i686/
python-matplotlib/repos/community-staging-i686/PKGBUILD
(from rev 107624, python-matplotlib/trunk/PKGBUILD)
python-matplotlib/repos/community-staging-i686/ffmpeg-2.0.patch
(from rev 107624, python-matplotlib/trunk/ffmpeg-2.0.patch)
python-matplotlib/repos/community-staging-x86_64/
python-matplotlib/repos/community-staging-x86_64/PKGBUILD
(from rev 107624, python-matplotlib/trunk/PKGBUILD)
python-matplotlib/repos/community-staging-x86_64/ffmpeg-2.0.patch
(from rev 107624, python-matplotlib/trunk/ffmpeg-2.0.patch)
-------------------------------------------+
community-staging-i686/PKGBUILD | 80 ++++++++++++++++++++++
community-staging-i686/ffmpeg-2.0.patch | 98 ++++++++++++++++++++++++++++
community-staging-x86_64/PKGBUILD | 80 ++++++++++++++++++++++
community-staging-x86_64/ffmpeg-2.0.patch | 98 ++++++++++++++++++++++++++++
4 files changed, 356 insertions(+)
Copied: python-matplotlib/repos/community-staging-i686/PKGBUILD (from rev
107624, python-matplotlib/trunk/PKGBUILD)
===================================================================
--- community-staging-i686/PKGBUILD (rev 0)
+++ community-staging-i686/PKGBUILD 2014-03-18 11:07:18 UTC (rev 107625)
@@ -0,0 +1,80 @@
+# $Id$
+# Maintainer: Stéphane Gaudreault <steph...@archlinux.org>
+# Contributor: Stefan Husmann <stefan-husm...@t-online.de>
+# Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve>
+# Contributor: Douglas Soares de Andrade <d...@aur.archlinux.org>
+
+pkgbase=python-matplotlib
+pkgname=('python2-matplotlib' 'python-matplotlib')
+pkgver=1.3.1
+pkgrel=3
+pkgdesc="A python plotting library, making publication quality plots"
+arch=('i686' 'x86_64')
+url='http://matplotlib.org'
+license=('custom')
+checkdepends=('python-nose' 'python2-nose')
+makedepends=('python2-pytz' 'python2-numpy' 'python2-pyqt4' 'python-pytz'
'python-numpy'
+ 'python-pyqt4' 'tk' 'python-cairo' 'python2-cairo'
'python-dateutil'
+ 'python2-dateutil' 'python-gobject' 'python2-gobject'
'python-pyparsing'
+ 'python2-pyparsing' 'pygtk' 'python-six' 'ghostscript'
'texlive-bin' 'agg'
+ 'python-tornado' 'python2-tornado' 'gtk3')
+source=("http://sourceforge.net/projects/matplotlib/files/matplotlib/matplotlib-${pkgver}/matplotlib-${pkgver}.tar.gz";
+ "ffmpeg-2.0.patch")
+sha512sums=('04877aa15b6d52a6f813e8377098d13c432f66ae2522c544575440180944c9b73a2164ae63edd3a0eff807883bf7b39cd55f28454ccee8c76146567ff4a6fd40'
+
'f76cde48aee9819f080bc34717c9cb6270f6dfac0490e7b19673ee665392be1837621aa858435f48595fa7d095e8efaee6737c87f9d42419499f5b8b8b001129')
+
+prepare() {
+ cp -a matplotlib-${pkgver} matplotlib-${pkgver}-py3
+
+ cd matplotlib-${pkgver}
+ patch -Np1 -i ../ffmpeg-2.0.patch
+ for file in $(find . -name '*.py' -print); do
+ sed -i -e "s|^#!.*/usr/bin/python|#!/usr/bin/python2|" \
+ -e "s|^#!.*/usr/bin/env *python|#!/usr/bin/env python2|" ${file}
+ done
+
+ cd ../matplotlib-${pkgver}-py3
+ patch -Np1 -i ../ffmpeg-2.0.patch
+ for file in $(find . -name '*.py' -print); do
+ sed -i -e "s|^#!.*/usr/bin/python|#!/usr/bin/python3|" \
+ -e "s|^#!.*/usr/bin/env *python|#!/usr/bin/env python3|" ${file}
+ done
+}
+
+build() {
+ cd matplotlib-${pkgver}
+ python2 setup.py build
+
+ cd ../matplotlib-${pkgver}-py3
+ python3 setup.py build
+}
+
+package_python2-matplotlib() {
+ depends=('python2-pytz' 'python2-numpy' 'python2-cairo' 'python2-pyqt4'
'python2-dateutil' 'python2-pyparsing')
+ optdepends=('pygtk: for use with the GTK or GTKAgg backend'
+ 'tk: used by the TkAgg backend'
+ 'ghostscript: usetex dependencies'
+ 'texlive-bin: usetex dependencies'
+ 'python2-tornado: for webagg backend')
+
+ cd matplotlib-${pkgver}
+ python2 setup.py install -O1 --skip-build --root "${pkgdir}" --prefix=/usr
+
+ install -dm755 "${pkgdir}"/usr/share/licenses/python2-matplotlib
+ install -m 644 doc/users/license.rst
"${pkgdir}"/usr/share/licenses/python2-matplotlib
+}
+
+package_python-matplotlib() {
+ depends=('python-pytz' 'python-numpy' 'python-cairo' 'python-pyqt4'
'python-dateutil' 'python-pyparsing')
+ optdepends=('pygtk: for use with the GTK or GTKAgg backend'
+ 'tk: used by the TkAgg backend'
+ 'ghostscript: usetex dependencies'
+ 'texlive-bin: usetex dependencies'
+ 'python-tornado: for webagg backend')
+
+ cd matplotlib-${pkgver}-py3
+ python3 setup.py install -O1 --skip-build --root "${pkgdir}" --prefix=/usr
+
+ install -dm755 "${pkgdir}"/usr/share/licenses/python-matplotlib
+ install -m 644 doc/users/license.rst
"${pkgdir}"/usr/share/licenses/python-matplotlib
+}
Copied: python-matplotlib/repos/community-staging-i686/ffmpeg-2.0.patch (from
rev 107624, python-matplotlib/trunk/ffmpeg-2.0.patch)
===================================================================
--- community-staging-i686/ffmpeg-2.0.patch (rev 0)
+++ community-staging-i686/ffmpeg-2.0.patch 2014-03-18 11:07:18 UTC (rev
107625)
@@ -0,0 +1,98 @@
+From 1935f1273aef443895a4da4e5f2c4aa86103a414 Mon Sep 17 00:00:00 2001
+From: Vlad Seghete <vlad.segh...@gmail.com>
+Date: Mon, 25 Nov 2013 13:35:57 -0600
+Subject: [PATCH 1/3] fixes issue #2482 and adds note about incompatibility
+ between bbox options and animation backends
+
+---
+ lib/matplotlib/animation.py | 8 ++++----
+ matplotlibrc.template | 4 ++++
+ 2 files changed, 8 insertions(+), 4 deletions(-)
+
+diff --git a/lib/matplotlib/animation.py b/lib/matplotlib/animation.py
+index 295d60d..9078c5d 100644
+--- a/lib/matplotlib/animation.py
++++ b/lib/matplotlib/animation.py
+@@ -399,9 +399,9 @@ class FFMpegFileWriter(FileMovieWriter, FFMpegBase):
+ def _args(self):
+ # Returns the command line parameters for subprocess to use
+ # ffmpeg to create a movie using a collection of temp images
+- return [self.bin_path(), '-vframes', str(self._frame_counter),
+- '-r', str(self.fps), '-i',
+- self._base_temp_name()] + self.output_args
++ return [self.bin_path(), '-i', self._base_temp_name()-vframes,
++ '-vframes', str(self._frame_counter),
++ '-r', str(self.fps), ] + self.output_args
+
+
+ # Base class of avconv information. AVConv has identical arguments to
+diff --git a/matplotlibrc.template b/matplotlibrc.template
+index 473d624..e4d3593 100644
+--- a/matplotlibrc.template
++++ b/matplotlibrc.template
+@@ -380,6 +380,10 @@ backend : %(backend)s
+ #savefig.edgecolor : white # figure edgecolor when saving
+ #savefig.format : png # png, ps, pdf, svg
+ #savefig.bbox : standard # 'tight' or 'standard'.
++ # 'tight' is incompatible with pipe-based
animation
++ # backends but will workd with temporary file
based ones:
++ # e.g. setting animation.writer to ffmpeg
will not work,
++ # use ffmpeg_file instead
+ #savefig.pad_inches : 0.1 # Padding to be used when bbox is set to
'tight'
+ #savefig.jpeg_quality: 95 # when a jpeg is saved, the default quality
parameter.
+ #savefig.directory : ~ # default directory in savefig dialog box,
+--
+1.8.5.1
+
+
+From f38fcb392d1d247b933f00e65022892007fb8325 Mon Sep 17 00:00:00 2001
+From: Vlad Seghete <vlad.segh...@gmail.com>
+Date: Mon, 25 Nov 2013 13:52:53 -0600
+Subject: [PATCH 2/3] fixed a typo
+
+---
+ lib/matplotlib/animation.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/matplotlib/animation.py b/lib/matplotlib/animation.py
+index 9078c5d..07c6d27 100644
+--- a/lib/matplotlib/animation.py
++++ b/lib/matplotlib/animation.py
+@@ -399,7 +399,7 @@ class FFMpegFileWriter(FileMovieWriter, FFMpegBase):
+ def _args(self):
+ # Returns the command line parameters for subprocess to use
+ # ffmpeg to create a movie using a collection of temp images
+- return [self.bin_path(), '-i', self._base_temp_name()-vframes,
++ return [self.bin_path(), '-i', self._base_temp_name(),
+ '-vframes', str(self._frame_counter),
+ '-r', str(self.fps), ] + self.output_args
+
+--
+1.8.5.1
+
+
+From 5c8f3d605ff045ddfbc3ca950aef85366617af5a Mon Sep 17 00:00:00 2001
+From: Vlad Seghete <vlad.segh...@gmail.com>
+Date: Mon, 25 Nov 2013 14:17:54 -0600
+Subject: [PATCH 3/3] fixed another typo
+
+---
+ lib/matplotlib/animation.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/matplotlib/animation.py b/lib/matplotlib/animation.py
+index 07c6d27..9854ca2 100644
+--- a/lib/matplotlib/animation.py
++++ b/lib/matplotlib/animation.py
+@@ -401,7 +401,7 @@ def _args(self):
+ # ffmpeg to create a movie using a collection of temp images
+ return [self.bin_path(), '-i', self._base_temp_name(),
+ '-vframes', str(self._frame_counter),
+- '-r', str(self.fps), ] + self.output_args
++ '-r', str(self.fps)] + self.output_args
+
+
+ # Base class of avconv information. AVConv has identical arguments to
+--
+1.8.5.1
+
Copied: python-matplotlib/repos/community-staging-x86_64/PKGBUILD (from rev
107624, python-matplotlib/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD (rev 0)
+++ community-staging-x86_64/PKGBUILD 2014-03-18 11:07:18 UTC (rev 107625)
@@ -0,0 +1,80 @@
+# $Id$
+# Maintainer: Stéphane Gaudreault <steph...@archlinux.org>
+# Contributor: Stefan Husmann <stefan-husm...@t-online.de>
+# Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve>
+# Contributor: Douglas Soares de Andrade <d...@aur.archlinux.org>
+
+pkgbase=python-matplotlib
+pkgname=('python2-matplotlib' 'python-matplotlib')
+pkgver=1.3.1
+pkgrel=3
+pkgdesc="A python plotting library, making publication quality plots"
+arch=('i686' 'x86_64')
+url='http://matplotlib.org'
+license=('custom')
+checkdepends=('python-nose' 'python2-nose')
+makedepends=('python2-pytz' 'python2-numpy' 'python2-pyqt4' 'python-pytz'
'python-numpy'
+ 'python-pyqt4' 'tk' 'python-cairo' 'python2-cairo'
'python-dateutil'
+ 'python2-dateutil' 'python-gobject' 'python2-gobject'
'python-pyparsing'
+ 'python2-pyparsing' 'pygtk' 'python-six' 'ghostscript'
'texlive-bin' 'agg'
+ 'python-tornado' 'python2-tornado' 'gtk3')
+source=("http://sourceforge.net/projects/matplotlib/files/matplotlib/matplotlib-${pkgver}/matplotlib-${pkgver}.tar.gz";
+ "ffmpeg-2.0.patch")
+sha512sums=('04877aa15b6d52a6f813e8377098d13c432f66ae2522c544575440180944c9b73a2164ae63edd3a0eff807883bf7b39cd55f28454ccee8c76146567ff4a6fd40'
+
'f76cde48aee9819f080bc34717c9cb6270f6dfac0490e7b19673ee665392be1837621aa858435f48595fa7d095e8efaee6737c87f9d42419499f5b8b8b001129')
+
+prepare() {
+ cp -a matplotlib-${pkgver} matplotlib-${pkgver}-py3
+
+ cd matplotlib-${pkgver}
+ patch -Np1 -i ../ffmpeg-2.0.patch
+ for file in $(find . -name '*.py' -print); do
+ sed -i -e "s|^#!.*/usr/bin/python|#!/usr/bin/python2|" \
+ -e "s|^#!.*/usr/bin/env *python|#!/usr/bin/env python2|" ${file}
+ done
+
+ cd ../matplotlib-${pkgver}-py3
+ patch -Np1 -i ../ffmpeg-2.0.patch
+ for file in $(find . -name '*.py' -print); do
+ sed -i -e "s|^#!.*/usr/bin/python|#!/usr/bin/python3|" \
+ -e "s|^#!.*/usr/bin/env *python|#!/usr/bin/env python3|" ${file}
+ done
+}
+
+build() {
+ cd matplotlib-${pkgver}
+ python2 setup.py build
+
+ cd ../matplotlib-${pkgver}-py3
+ python3 setup.py build
+}
+
+package_python2-matplotlib() {
+ depends=('python2-pytz' 'python2-numpy' 'python2-cairo' 'python2-pyqt4'
'python2-dateutil' 'python2-pyparsing')
+ optdepends=('pygtk: for use with the GTK or GTKAgg backend'
+ 'tk: used by the TkAgg backend'
+ 'ghostscript: usetex dependencies'
+ 'texlive-bin: usetex dependencies'
+ 'python2-tornado: for webagg backend')
+
+ cd matplotlib-${pkgver}
+ python2 setup.py install -O1 --skip-build --root "${pkgdir}" --prefix=/usr
+
+ install -dm755 "${pkgdir}"/usr/share/licenses/python2-matplotlib
+ install -m 644 doc/users/license.rst
"${pkgdir}"/usr/share/licenses/python2-matplotlib
+}
+
+package_python-matplotlib() {
+ depends=('python-pytz' 'python-numpy' 'python-cairo' 'python-pyqt4'
'python-dateutil' 'python-pyparsing')
+ optdepends=('pygtk: for use with the GTK or GTKAgg backend'
+ 'tk: used by the TkAgg backend'
+ 'ghostscript: usetex dependencies'
+ 'texlive-bin: usetex dependencies'
+ 'python-tornado: for webagg backend')
+
+ cd matplotlib-${pkgver}-py3
+ python3 setup.py install -O1 --skip-build --root "${pkgdir}" --prefix=/usr
+
+ install -dm755 "${pkgdir}"/usr/share/licenses/python-matplotlib
+ install -m 644 doc/users/license.rst
"${pkgdir}"/usr/share/licenses/python-matplotlib
+}
Copied: python-matplotlib/repos/community-staging-x86_64/ffmpeg-2.0.patch (from
rev 107624, python-matplotlib/trunk/ffmpeg-2.0.patch)
===================================================================
--- community-staging-x86_64/ffmpeg-2.0.patch (rev 0)
+++ community-staging-x86_64/ffmpeg-2.0.patch 2014-03-18 11:07:18 UTC (rev
107625)
@@ -0,0 +1,98 @@
+From 1935f1273aef443895a4da4e5f2c4aa86103a414 Mon Sep 17 00:00:00 2001
+From: Vlad Seghete <vlad.segh...@gmail.com>
+Date: Mon, 25 Nov 2013 13:35:57 -0600
+Subject: [PATCH 1/3] fixes issue #2482 and adds note about incompatibility
+ between bbox options and animation backends
+
+---
+ lib/matplotlib/animation.py | 8 ++++----
+ matplotlibrc.template | 4 ++++
+ 2 files changed, 8 insertions(+), 4 deletions(-)
+
+diff --git a/lib/matplotlib/animation.py b/lib/matplotlib/animation.py
+index 295d60d..9078c5d 100644
+--- a/lib/matplotlib/animation.py
++++ b/lib/matplotlib/animation.py
+@@ -399,9 +399,9 @@ class FFMpegFileWriter(FileMovieWriter, FFMpegBase):
+ def _args(self):
+ # Returns the command line parameters for subprocess to use
+ # ffmpeg to create a movie using a collection of temp images
+- return [self.bin_path(), '-vframes', str(self._frame_counter),
+- '-r', str(self.fps), '-i',
+- self._base_temp_name()] + self.output_args
++ return [self.bin_path(), '-i', self._base_temp_name()-vframes,
++ '-vframes', str(self._frame_counter),
++ '-r', str(self.fps), ] + self.output_args
+
+
+ # Base class of avconv information. AVConv has identical arguments to
+diff --git a/matplotlibrc.template b/matplotlibrc.template
+index 473d624..e4d3593 100644
+--- a/matplotlibrc.template
++++ b/matplotlibrc.template
+@@ -380,6 +380,10 @@ backend : %(backend)s
+ #savefig.edgecolor : white # figure edgecolor when saving
+ #savefig.format : png # png, ps, pdf, svg
+ #savefig.bbox : standard # 'tight' or 'standard'.
++ # 'tight' is incompatible with pipe-based
animation
++ # backends but will workd with temporary file
based ones:
++ # e.g. setting animation.writer to ffmpeg
will not work,
++ # use ffmpeg_file instead
+ #savefig.pad_inches : 0.1 # Padding to be used when bbox is set to
'tight'
+ #savefig.jpeg_quality: 95 # when a jpeg is saved, the default quality
parameter.
+ #savefig.directory : ~ # default directory in savefig dialog box,
+--
+1.8.5.1
+
+
+From f38fcb392d1d247b933f00e65022892007fb8325 Mon Sep 17 00:00:00 2001
+From: Vlad Seghete <vlad.segh...@gmail.com>
+Date: Mon, 25 Nov 2013 13:52:53 -0600
+Subject: [PATCH 2/3] fixed a typo
+
+---
+ lib/matplotlib/animation.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/matplotlib/animation.py b/lib/matplotlib/animation.py
+index 9078c5d..07c6d27 100644
+--- a/lib/matplotlib/animation.py
++++ b/lib/matplotlib/animation.py
+@@ -399,7 +399,7 @@ class FFMpegFileWriter(FileMovieWriter, FFMpegBase):
+ def _args(self):
+ # Returns the command line parameters for subprocess to use
+ # ffmpeg to create a movie using a collection of temp images
+- return [self.bin_path(), '-i', self._base_temp_name()-vframes,
++ return [self.bin_path(), '-i', self._base_temp_name(),
+ '-vframes', str(self._frame_counter),
+ '-r', str(self.fps), ] + self.output_args
+
+--
+1.8.5.1
+
+
+From 5c8f3d605ff045ddfbc3ca950aef85366617af5a Mon Sep 17 00:00:00 2001
+From: Vlad Seghete <vlad.segh...@gmail.com>
+Date: Mon, 25 Nov 2013 14:17:54 -0600
+Subject: [PATCH 3/3] fixed another typo
+
+---
+ lib/matplotlib/animation.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/matplotlib/animation.py b/lib/matplotlib/animation.py
+index 07c6d27..9854ca2 100644
+--- a/lib/matplotlib/animation.py
++++ b/lib/matplotlib/animation.py
+@@ -401,7 +401,7 @@ def _args(self):
+ # ffmpeg to create a movie using a collection of temp images
+ return [self.bin_path(), '-i', self._base_temp_name(),
+ '-vframes', str(self._frame_counter),
+- '-r', str(self.fps), ] + self.output_args
++ '-r', str(self.fps)] + self.output_args
+
+
+ # Base class of avconv information. AVConv has identical arguments to
+--
+1.8.5.1
+
