Merge branch 'master' of ssh://parabolagnulinux.org:1863/srv/git/abslibre

24 files changed, 685 insertions, 163 deletions

diff --git a/pcr/amsynth/PKGBUILD b/pcr/amsynth/PKGBUILD
index 1cd3cccf6..7142d6c9f 100644
--- a/pcr/amsynth/PKGBUILD
+++ b/pcr/amsynth/PKGBUILD
@@ -1,26 +1,25 @@
 # Maintainer : Guest One <theguestone at gmail dot com>
 
 pkgname=amsynth
-pkgver=1.3.2
-pkgrel=2
+pkgver=1.4.0
+pkgrel=1
 pkgdesc="Analogue Modeling SYNTHesizer"
 arch=('i686' 'x86_64')
-url="http://code.google.com/p/amsynth/"
+url="http://code.google.com/p/$pkgname/"
 license=('GPL')
-depends=('gtkmm' 'jack' 'liblo')
-makedepends=('desktop-file-utils' 'dssi' 'libtool' 'ladspa')
+depends=('gtkmm' 'jack' 'liblo' 'ladspa')
+makedepends=('desktop-file-utils' 'dssi' 'libtool')
 install="$pkgname.install"
-source=("http://amsynth.googlecode.com/files/amSynth-$pkgver.tar.gz")
-md5sums=('991329e433bb8c496f9ca5158faf0bca')
+source=("http://$pkgname.googlecode.com/files/$pkgname-$pkgver.tar.gz")
+md5sums=('9193d334c89996cf44e98422e03318bb')
 
 build() {
-  cd "$srcdir/amSynth-$pkgver"
-  libtoolize
+  cd "$srcdir/$pkgname-$pkgver"
   ./configure --prefix=/usr
   make
 }
 
 package() {
-  cd "$srcdir/amSynth-$pkgver"
+  cd "$srcdir/$pkgname-$pkgver"
   make DESTDIR="$pkgdir/" install
 }
diff --git a/pcr/bibletime/PKGBUILD b/pcr/bibletime/PKGBUILD
new file mode 100644
index 000000000..3a2941623
--- /dev/null
+++ b/pcr/bibletime/PKGBUILD
@@ -0,0 +1,39 @@
+# Maintainer: SanskritFritz (gmail)
+# Contributor: Alexander Rødseth <rodseth@gmail.com>
+# Contributor: Tobias T. <OldShatterhand at gmx-topmail dot de>
+
+pkgname=bibletime
+pkgver=2.9.2
+pkgrel=10
+pkgdesc="Bible study tool for KDE4"
+arch=('x86_64' 'i686')
+url="http://www.bibletime.info/"
+license=('GPL2')
+depends=('sword' 'openssl' 'clucene' 'qtwebkit')
+makedepends=('cmake')
+install=$pkgname.install
+source=("http://sourceforge.net/projects/$pkgname/files/$pkgname-$pkgver.tar.bz2")
+
+build() {
+	cd "$srcdir/$pkgname-$pkgver"
+
+	CXXFLAGS+=" -fpermissive"
+
+#	rm CMakeCache.txt
+	cmake \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DCMAKE_BUILD_TYPE=Release \
+		-DQT_QMAKE_EXECUTABLE=qmake4 \
+		-DBT_FORCE_USE_QT4=TRUE \
+		"$srcdir/$pkgname-$pkgver"
+	make
+}
+
+package() {
+	cd "$srcdir/$pkgname-$pkgver"
+
+	make DESTDIR="$pkgdir" install
+}
+
+# vim:set ts=2 sw=2 et:
+sha256sums=('393c77419b0514645cf2417f52d37bdbd604f8eeb37e76355e14c38d896093c8')
diff --git a/pcr/bibletime/bibletime.install b/pcr/bibletime/bibletime.install
new file mode 100644
index 000000000..ad97d7bab
--- /dev/null
+++ b/pcr/bibletime/bibletime.install
@@ -0,0 +1,13 @@
+post_upgrade() {
+  update-desktop-database -q
+}
+
+post_install() {
+  post_upgrade
+}
+
+post_remove() {
+  post_upgrade
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/pcr/mitsuba/PKGBUILD b/pcr/mitsuba/PKGBUILD
index 747641dcc..f2d7f83b0 100644
--- a/pcr/mitsuba/PKGBUILD
+++ b/pcr/mitsuba/PKGBUILD
@@ -14,7 +14,7 @@ _adddat=20130320
 _addrev=40
 _bldep=8
 _pyver=3.3
-pkgrel=2
+pkgrel=3
 pkgdesc='A physically based renderer'
 arch=(
   i686
@@ -118,7 +118,7 @@ package_blender-addon-mitsuba() {
   cd $srcdir/$_addname
 
   a=$pkgdir/usr/share/$_bldname/$_bldver/scripts/addons
-  b=$pkgdir/usr/share/licenses/$_pkgname
+  b=$pkgdir/usr/share/licenses/$pkgname
   c=$srcdir/$_pkgname-v$_pkgver/doc/license.txt
 
   install -d $a && cp -a $_pkgname $a
diff --git a/pcr/perl-geo-ipfree/PKGBUILD b/pcr/perl-geo-ipfree/PKGBUILD
new file mode 100644
index 000000000..394e38ca1
--- /dev/null
+++ b/pcr/perl-geo-ipfree/PKGBUILD
@@ -0,0 +1,28 @@
+_author=bricas
+_perlmod=Geo-IPfree
+pkgname=perl-geo-ipfree
+pkgver=1.131650
+pkgrel=1
+pkgdesc="An IPv4 to country lookup database"
+arch=('any')
+url="http://search.cpan.org/~$_author/$_perlmod-$pkgver/"
+license=('GPL' 'PerlArtistic')
+depends=('perl>=5.10.0')
+options=(!emptydirs)
+source=(http://search.cpan.org/CPAN/authors/id/B/BR/BRICAS/$_perlmod-$pkgver.tar.gz)
+md5sums=('23d71e4f9a872184d9b4c6903c5a2b98')
+
+build() {
+  cd "$srcdir/$_perlmod-$pkgver"
+
+  # Install module in vendor directories.
+  PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
+  make
+}
+
+package() {
+  cd "$srcdir/$_perlmod-$pkgver"
+  make install DESTDIR="$pkgdir/"
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/pcr/perl-net-sftp-foreign/Changes b/pcr/perl-net-sftp-foreign/Changes
index eff2bb00b..f730a8973 100644
--- a/pcr/perl-net-sftp-foreign/Changes
+++ b/pcr/perl-net-sftp-foreign/Changes
@@ -1,5 +1,48 @@
 Revision history for Net::SFTP::Foreign
 
+1.75  Apr 2, 2013
+        - release as stable
+
+1.74_07  Mar 21, 2013
+        - seek method was returning offset instead of success value
+          (bug report by Paul Kolano).
+
+1.74_06  Mar 12, 2013
+        - disconnect may kill some unrelated process when called
+          repeatly (bug report by Douglas Wilson)
+        - debug was clobbering $!
+
+1.74_05  Feb 5, 2013
+        - error was not being set on timeouts (bug report by Kqfh
+          Jjgrn)
+
+1.74_04  Oct 25, 2012
+        - overwriting rename of a file over itself was broken (bug
+          report by Mike Wilder)
+        - stat and lstat path arguments is now optional and defaults
+          to '.' (bug report by Paul Kolano)
+        - fstat was broken
+        - add git repository and bugtracker into meta files
+
+1.74_03  Sep 21, 2012
+        - put_content was broken (bug report by Caleb Cushing)
+        - document put_content method
+        - add more tests
+
+1.74_02  Jul 11, 2012
+        - rget was dieing when trying to copy remote symbolic links
+        - add support for get method slow-start feature: when file
+          size is unknown don't start asking for $queue_size packets
+          as it slows down the transfer of small files, instead,
+          starting from a queue size of one go gradually increasing it
+          until the stated maximum is reached (bug report by David
+          R. Wagner)
+        - parse supported2 extension
+
+1.74_01
+        - add support for password_prompt (feature request by Douglas
+          Wilson)
+
 1.73  May 11, 2012
         - password authentication was broken on Solaris (maybe also on
           others) due to an incorrect waitpid call (bug report and
@@ -134,6 +177,7 @@ Revision history for Net::SFTP::Foreign
           get_symlink options using hashes
         - remove operation inside put_symlink was clobbering error and
           status from previous symlink call
+        - solve several minor bugs related to autodie handling
         - do not die from inside DESTROY methods when autodie is set
         - resume feature in get method was broken
         - refactor numbered logic inside _inc_numbered sub
diff --git a/pcr/perl-net-sftp-foreign/PKGBUILD b/pcr/perl-net-sftp-foreign/PKGBUILD
index 61fb3b8df..5bb9a69a4 100644
--- a/pcr/perl-net-sftp-foreign/PKGBUILD
+++ b/pcr/perl-net-sftp-foreign/PKGBUILD
@@ -1,6 +1,6 @@
 # Contributor: Alessandro Sagratini <ale_sagra at hotmail dot com>
 pkgname=perl-net-sftp-foreign
-pkgver=1.73
+pkgver=1.75
 pkgrel=1
 pkgdesc="Perl SFTP client using the native SSH client application"
 arch=(any)
@@ -11,7 +11,7 @@ optdepends=('perl-file-which' 'perl-sort-key')
 options=(!emptydirs)
 changelog=Changes
 source=(http://search.cpan.org/CPAN/authors/id/S/SA/SALVA/Net-SFTP-Foreign-$pkgver.tar.gz)
-md5sums=('3de69b9281027e484a30e3efa581981f')
+md5sums=('2545691cd69f8515dd9c126cc52e40c5')
 
 build() {
 	cd "$srcdir/Net-SFTP-Foreign-$pkgver"
diff --git a/pcr/perl-php-serialization/PKGBUILD b/pcr/perl-php-serialization/PKGBUILD
index f09269c92..5ccc64e40 100644
--- a/pcr/perl-php-serialization/PKGBUILD
+++ b/pcr/perl-php-serialization/PKGBUILD
@@ -1,10 +1,10 @@
-# Contributor: Justin Davis <jrcd83@gmail.com>
-# Generator  : CPANPLUS::Dist::Arch 1.18
-# Maintainer (Parabola): Márcio Silva    <coadde@lavabit.com>
+# CPAN Name  : PHP-Serialization
+# Contributor: John D Jones III <j[nospace]n[nospace]b[nospace]e[nospace]k[nospace]1972 -_AT_- the domain name google offers a mail service at ending in dot com>
+# Generator  : CPANPLUS::Dist::Arch 1.25
 
 pkgname='perl-php-serialization'
 pkgver='0.34'
-pkgrel='1'
+pkgrel='2'
 pkgdesc="simple flexible means of converting the output of PHP's serialize() into the equivalent Perl memory structure, and vice versa."
 arch=('any')
 license=('PerlArtistic' 'GPL')
@@ -15,7 +15,7 @@ url='http://search.cpan.org/dist/PHP-Serialization'
 source=('http://search.cpan.org/CPAN/authors/id/B/BO/BOBTFISH/PHP-Serialization-0.34.tar.gz')
 md5sums=('333af0848ad79931875a35cc61dc22e0')
 sha512sums=('72218973f21ab71419751cf818e6bd998235aa74bf8ae60ec4a6080ba169d0d7fcefde4f433ce3f6f30ed3084a651deb8aa3a5dd818fc6ebf3fb6188def4efe7')
-_distdir="${srcdir}/PHP-Serialization-0.34"
+_distdir="PHP-Serialization-0.34"
 
 build() {
   ( export PERL_MM_USE_DEFAULT=1 PERL5LIB=""                 \
@@ -24,22 +24,23 @@ build() {
       PERL_MB_OPT="--installdirs vendor --destdir '$pkgdir'" \
       MODULEBUILDRC=/dev/null
 
-    cd "$_distdir"
+    cd "$srcdir/$_distdir"
     /usr/bin/perl Makefile.PL
     make
   )
 }
 
 check() {
-  cd "$_distdir"
+  cd "$srcdir/$_distdir"
   ( export PERL_MM_USE_DEFAULT=1 PERL5LIB=""
     make test
   )
 }
 
 package() {
-  cd "$_distdir"
+  cd "$srcdir/$_distdir"
   make install
+
   find "$pkgdir" -name .packlist -o -name perllocal.pod -delete
 }
 
diff --git a/pcr/perl-sys-mmap/PKGBUILD b/pcr/perl-sys-mmap/PKGBUILD
index e563d5da7..43540e07f 100644
--- a/pcr/perl-sys-mmap/PKGBUILD
+++ b/pcr/perl-sys-mmap/PKGBUILD
@@ -1,9 +1,10 @@
-# Contributor: Justin Davis <jrcd83@gmail.com>
-# Generator  : CPANPLUS::Dist::Arch 1.18
+# CPAN Name  : Sys-Mmap
+# Contributor: John D Jones III <j[nospace]n[nospace]b[nospace]e[nospace]k[nospace]1972 -_AT_- the domain name google offers a mail service at ending in dot com>
+# Generator  : CPANPLUS::Dist::Arch 1.25
 
 pkgname='perl-sys-mmap'
 pkgver='0.16'
-pkgrel='1'
+pkgrel='3'
 pkgdesc="uses mmap to map in a file as a Perl variable"
 arch=('i686' 'x86_64')
 license=('PerlArtistic' 'GPL')
@@ -14,7 +15,7 @@ url='http://search.cpan.org/dist/Sys-Mmap'
 source=('http://search.cpan.org/CPAN/authors/id/T/TO/TODDR/Sys-Mmap-0.16.tar.gz')
 md5sums=('faae869e876fa86f92e6de3f13af3aef')
 sha512sums=('9f533f8eaa2707a77fa69dc0163e5e55b13d6653ddb5f7850c3fcaa090c79069cccedb947c1b8cd5a125fd7b055803eff437697c120785f422bff0414be7cd05')
-_distdir="${srcdir}/Sys-Mmap-0.16"
+_distdir="Sys-Mmap-0.16"
 
 build() {
   ( export PERL_MM_USE_DEFAULT=1 PERL5LIB=""                 \
@@ -23,22 +24,23 @@ build() {
       PERL_MB_OPT="--installdirs vendor --destdir '$pkgdir'" \
       MODULEBUILDRC=/dev/null
 
-    cd "$_distdir"
+    cd "$srcdir/$_distdir"
     /usr/bin/perl Makefile.PL
     make
   )
 }
 
 check() {
-  cd "$_distdir"
+  cd "$srcdir/$_distdir"
   ( export PERL_MM_USE_DEFAULT=1 PERL5LIB=""
     make test
   )
 }
 
 package() {
-  cd "$_distdir"
+  cd "$srcdir/$_distdir"
   make install
+
   find "$pkgdir" -name .packlist -o -name perllocal.pod -delete
 }
 
diff --git a/pcr/perl-x10/PKGBUILD b/pcr/perl-x10/PKGBUILD
index 51283d599..0a0d352cb 100644
--- a/pcr/perl-x10/PKGBUILD
+++ b/pcr/perl-x10/PKGBUILD
@@ -1,30 +1,51 @@
-# This PKGBUILD was generated by cpan4pacman via CPANPLUS::Dist::Pacman
-# Contributor: Ross melin <rdmelin@gmail.com>
+# CPAN Name  : X10
+# Contributor: John D Jones III <j[nospace]n[nospace]b[nospace]e[nospace]k[nospace]1972 -_AT_- the domain name google offers a mail service at ending in dot com>
+# Generator  : CPANPLUS::Dist::Arch 1.25
 
-# Required by zoneminder
-
-pkgname=perl-x10
-pkgver=0.03
-pkgrel=2
-pkgdesc="X10"
-arch=('i686' 'x86_64')
-url="http://search.cpan.org/~ROBF/X10"
-license=('GPL' 'PerlArtistic')
-depends=('perl-astro-suntime>=0.01' 'perl-device-serialport' 'perl-time-modules')
+pkgname='perl-x10'
+pkgver='0.03'
+pkgrel='3'
+pkgdesc=""
+arch=('any')
+license=('PerlArtistic' 'GPL')
 options=('!emptydirs')
-source=(http://www.cpan.org/authors/id/R/RO/ROBF/X10-$pkgver.tar.gz) 
+depends=('perl-astro-suntime>=0.01' 'perl-device-serialport' 'perl-time-modules')
+makedepends=()
+url='http://search.cpan.org/dist/X10'
+source=('http://search.cpan.org/CPAN/authors/id/R/RO/ROBF/X10-0.03.tar.gz')
 md5sums=('056b3d98fab545865148b948de6784c7')
+sha512sums=('6ed2b9526732dc5f704ceb94f3a9abb51c208aabb6f127480046ce1f01ecf763e4de2dcb5bf52ef598831dbd5ba78ff9d108238001070076b0cc05c7681dea2f')
+_distdir="X10-0.03"
 
 build() {
-  cd  $startdir/src/X10-$pkgver
-  eval `perl -V:archname`
-  PERL_MM_USE_DEFAULT=1 /usr/bin/perl Makefile.PL \
-      INSTALLDIRS=vendor || return 1
-  
-  /usr/bin/make || return 1
-  /usr/bin/make DESTDIR=$startdir/pkg install || return 1
-  /usr/bin/find $startdir/pkg -name '.packlist' -delete
-  /usr/bin/find $startdir/pkg -name '*.pod' -delete
+  ( export PERL_MM_USE_DEFAULT=1 PERL5LIB=""                 \
+      PERL_AUTOINSTALL=--skipdeps                            \
+      PERL_MM_OPT="INSTALLDIRS=vendor DESTDIR='$pkgdir'"     \
+      PERL_MB_OPT="--installdirs vendor --destdir '$pkgdir'" \
+      MODULEBUILDRC=/dev/null
+
+    cd "$srcdir/$_distdir"
+    /usr/bin/perl Makefile.PL
+    make
+  )
+}
+
+check() {
+  cd "$srcdir/$_distdir"
+  ( export PERL_MM_USE_DEFAULT=1 PERL5LIB=""
+    make test
+  )
+}
+
+package() {
+  cd "$srcdir/$_distdir"
+  make install
+
+  find "$pkgdir" -name .packlist -o -name perllocal.pod -delete
 }
 
+# Local Variables:
+# mode: shell-script
+# sh-basic-offset: 2
+# End:
 # vim:set ts=2 sw=2 et:
diff --git a/pcr/python2-renpy/PKGBUILD b/pcr/python2-renpy/PKGBUILD
index b5891747d..e9f039431 100644
--- a/pcr/python2-renpy/PKGBUILD
+++ b/pcr/python2-renpy/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=python2-renpy
 pkgflag=renpy
-pkgver=6.15.0
+pkgver=6.15.5
 pkgrel=1
 pkgdesc="Platform-dependant Ren'Py libraries."
 arch=(
@@ -18,18 +18,13 @@ url="http://www.$pkgflag.org/"
 depends=(
   fribidi
   glew
-  libav
-  libgl
-  python2-pygame
+  python2-pygame=1.9.1
 )
 # python-argparse is part of distribution since 2.7
 makedepends=(
-  cython2
-  libav-builder # to solve libav deps
-  mesa
   'python2>=2.7'
+  'ffmpeg'
 )
-options=!buildflags
 provides="python-$pkgflag=$pkgver"
 conflicts=(
   python-$pkgflag
@@ -44,7 +39,7 @@ source=(
 )
 
 sha512sums=(
-  8ad2299a61d0e2e2c0c08d441459b28a09a3244dfcf173957e3bbbf2d9eb64087c12c05e62438dca815116d9582a136c50d5cceb33796146adc4d9508ac630b1
+  fc8f640cacf1554c969ded2d9c605d4f5c8e14bff6168aa5b4040e59054be46a2b83d6df686bea7e0103a13eaa01d52322d6fa6a34a1dcac90e011e3b5d24a6e
 )
 
 build() {
diff --git a/pcr/renpy/ChangeLog b/pcr/renpy/ChangeLog
index 566d97fa9..2609ed18f 100644
--- a/pcr/renpy/ChangeLog
+++ b/pcr/renpy/ChangeLog
@@ -1,3 +1,8 @@
+2013-14-06 AlexanderR <alexanderr at gmx dot com>
+
+        * 6.15.5-1 :
+        new upstream release.
+
 2012-28-07 AlexanderR <alexanderr at gmx dot com>
 
         * 6.14.1-1 :
diff --git a/pcr/renpy/PKGBUILD b/pcr/renpy/PKGBUILD
index 0baad307c..1ed569477 100644
--- a/pcr/renpy/PKGBUILD
+++ b/pcr/renpy/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
 
 pkgname=renpy
-pkgver=6.15.0
+pkgver=6.15.5
 pkgrel=1
 pkgdesc="Ren'Py is a visual novel engine that helps you use words, images, and sounds to tell stories with the computer. This package contains both player and development tools."
 arch=('any')
@@ -21,14 +21,12 @@ source=("http://www.renpy.org/dl/$pkgver/renpy-$pkgver-source.tar.bz2"
 	'python2.diff'
 	'renpy-launcher.sh')
 
-sha512sums=(
-  8ad2299a61d0e2e2c0c08d441459b28a09a3244dfcf173957e3bbbf2d9eb64087c12c05e62438dca815116d9582a136c50d5cceb33796146adc4d9508ac630b1
-  1af85c7a0c10662bfa4c03611fed695325f5953ac0f2c913f5342b1dca22b22115f07e69d646d92a3b95f5b896283e9b1bc7fe3e0a338536b5d9d48beedae8d5
-  2a9302adbc6ff45e048d42487ac86e7501f90b2d393933af5d39d663a0b3707f795a04f65598e356a64809dfa0175a4ad860b355e5337ee149692c21caf339df
-  bcb3152a88d5f913a99855e9d6fa5d0019e310ba9d55a6288d2d8b60cb6c9ab3ddf8c772dfd23a2851d52479adc2a16bd3ffe25ff7fb50d222ec1f55eaa48b09
-  3ae0627b8c12658f530f7d7a6a1e9226aee3e387c9ac011f00a4b5ed7394115c3b653f7a4a45c6ee2ef102fb584df1cec36f306eceff3d18aac49b5aad4a9fab
-  727f9f16e1cff76c279d6e1578572a92c7b21ec34c6cb2841a04ac7b5cf6d2836487293744a9541993ee2e3a8dae927feb4e78f1afd01a748f5489090453cdd7
-)
+md5sums=('45e7c28a426c8d9ef470d09e7a689568'
+         'a9beb35fa6c6d8af7ba5d2a764c33158'
+         'd206d24b78e207a2c3b603fef14ac47f'
+         '8b9922e26e567248a2a5adc1d0cdfdd4'
+         '0476b16220e6faeb031e1dbfe45249b4'
+         'dfa92cdecc15e5c1ddee387fbbbb2d9c')
 
 build() {
   cd "$srcdir/renpy-$pkgver-source"
@@ -36,7 +34,8 @@ build() {
   patch -p1 < ../python2.diff
 
   # fonts are provided by ttf-dejavu
-  rm $pkgname/common/DejaVuSans.ttf $pkgname/common/DejaVuSans.txt
+  cd $pkgname
+  rm common/DejaVuSans.ttf common/DejaVuSans.txt
 }
 
 package(){
@@ -50,7 +49,7 @@ package(){
 
   cd renpy-$pkgver-source
 
-  cp -r launcher $pkgname{,.py}  template the_question tutorial "$pkgdir/usr/share/$pkgname"
+  cp -r launcher $pkgname{,.py} $pkgname/common template the_question tutorial "$pkgdir/usr/share/$pkgname"
   cp -r doc/* "$pkgdir/usr/share/doc/$pkgname"
   install -D -m644 launcher/game/logo.png "$pkgdir/usr/share/pixmaps/${pkgname}.png"
   install -D -m644 'LICENSE.txt' "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
diff --git a/pcr/sword/PKGBUILD b/pcr/sword/PKGBUILD
new file mode 100644
index 000000000..78ab4e646
--- /dev/null
+++ b/pcr/sword/PKGBUILD
@@ -0,0 +1,68 @@
+# Maintainer:
+# Contributor: Alexander Rødseth
+# Contributor: Andrea Scarpino
+# Contributor: Stefan Husmann <stefan-husmann@t-online.de>
+# Contributor: TripleE <eric1548@yahoo.com>
+# Contributor: Dominic Tubach
+
+pkgname=sword
+pkgver=1.6.2
+pkgrel=9
+pkgdesc="Library for Bible study programs"
+arch=('x86_64' 'i686')
+url="http://www.crosswire.org/sword/"
+license=('GPL')
+depends=('curl' 'clucene' 'swig')
+makedepends=('cmake')
+backup=('etc/sword.conf')
+source=("http://www.crosswire.org/ftpmirror/pub/$pkgname/source/v1.6/$pkgname-$pkgver.tar.gz"
+        "curl.patch"
+        "multimap.patch")
+sha256sums=('af76c7d54135c444b09eeaafb49229ef5201a4e1d44539d9341dceaeb60a87b9'
+            '3c2676b6dc1d56b08b2532f46af32c54e91ea71ed92a5d7a30ee29ed7ff09124'
+            'ddcde54fbd9b29585c03565bff7891622cb2cc0a6381047d5f566987a7cb1b8c')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  patch -p1 -i ../curl.patch
+  patch -p1 -i ../multimap.patch
+
+  [[ -d ../build ]] || mkdir ../build
+  cd ../build
+
+  CXXFLAGS=-fpermissive cmake "../$pkgname-$pkgver" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DSWORD_GLOBAL_CONF_DIR=/etc
+  make
+}
+
+package() {
+  cd "$srcdir/build"
+
+  make DESTDIR="$pkgdir" install
+
+  install -d "$pkgdir/usr/lib/sword"
+  mv "$pkgdir"/usr/lib/${pkgver}_icu_* \
+    "$pkgdir/usr/lib/sword/"
+
+  cd "$srcdir/$pkgname-$pkgver/locales.d/"
+  for file in *.conf; do
+    install -Dm644 "$file" \
+      "$pkgdir/usr/share/sword/locales.d/$file"
+  done
+
+  cd ../include
+  install -d "$pkgdir/usr/include/sword"
+  install -Dm644 canon_{catholic{,2},synodalp}.h \
+    "$pkgdir/usr/include/sword"
+
+  cd ../samples
+  install -Dm644 mods.d/globals.conf \
+    "$pkgdir/usr/share/sword/mods.d/globals.conf"
+  install -Dm644 recommended/sword.conf \
+    "$pkgdir/etc/sword.conf"
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/pcr/sword/curl.patch b/pcr/sword/curl.patch
new file mode 100644
index 000000000..63fd4433c
--- /dev/null
+++ b/pcr/sword/curl.patch
@@ -0,0 +1,22 @@
+diff -Naur sword-1.6.2.orig/src/mgr/curlftpt.cpp sword-1.6.2.new/src/mgr/curlftpt.cpp
+--- sword-1.6.2.orig/src/mgr/curlftpt.cpp	2011-07-27 00:41:40.000000000 +0200
++++ sword-1.6.2.new/src/mgr/curlftpt.cpp	2011-07-27 00:42:05.000000000 +0200
+@@ -26,7 +26,6 @@
+ #include <fcntl.h>
+ 
+ #include <curl/curl.h>
+-#include <curl/types.h>
+ #include <curl/easy.h>
+ 
+ #include <swlog.h>
+diff -Naur sword-1.6.2.orig/src/mgr/curlhttpt.cpp sword-1.6.2.new/src/mgr/curlhttpt.cpp
+--- sword-1.6.2.orig/src/mgr/curlhttpt.cpp	2011-07-27 00:41:40.000000000 +0200
++++ sword-1.6.2.new/src/mgr/curlhttpt.cpp	2011-07-27 00:42:45.000000000 +0200
+@@ -25,7 +25,6 @@
+ #include <cctype>
+ 
+ #include <curl/curl.h>
+-#include <curl/types.h>
+ #include <curl/easy.h>
+ 
+ #include <swlog.h>
diff --git a/pcr/sword/multimap.patch b/pcr/sword/multimap.patch
new file mode 100644
index 000000000..7957ab2d8
--- /dev/null
+++ b/pcr/sword/multimap.patch
@@ -0,0 +1,39 @@
+--- sword-1.6.2/include/multimapwdef.h	2004-05-04 23:01:39.000000000 +0200
++++ /usr/include/sword/multimapwdef.h	2012-06-02 13:37:47.816457345 +0200
+@@ -7,26 +7,26 @@
+ 
+ // multmap that still lets you use [] to reference FIRST
+ // entry of a key if multiples exist
+-template <class Key, class T, class Compare>
+-class multimapwithdefault : public std::multimap<Key, T, Compare> {
++template < class Key, class T, class Compare >
++class multimapwithdefault : public std::multimap< Key, T, Compare > {
+ public:
+-	typedef std::pair<const Key, T> value_type;
++	typedef std::pair< const Key, T > value_type;
+ 	T& getWithDefault(const Key& k, const T& defaultValue) {
+-		if (find(k) == this->end()) {
+-			insert(value_type(k, defaultValue));
++		if (this->find(k) == this->end()) {
++			this->insert(value_type(k, defaultValue));
+ 		}
+ 		return (*(find(k))).second;
+ 	}
+ 
+ 	T& operator[](const Key& k) {
+-		if (find(k) == this->end()) {
+-			insert(value_type(k, T()));
++		if (this->find(k) == this->end()) {
++			this->insert(value_type(k, T()));
+ 		}
+-		return (*(find(k))).second;
++		return (*(this->find(k))).second;
+ 	}
+ 	bool has(const Key& k, const T &val) const {
+-		typename std::multimap<Key, T, Compare>::const_iterator start = lower_bound(k);
+-		typename std::multimap<Key, T, Compare>::const_iterator end = upper_bound(k);
++		typename std::multimap< Key, T, Compare >::const_iterator start = this->lower_bound(k);
++		typename std::multimap< Key, T, Compare >::const_iterator end = this->upper_bound(k);
+ 		for (; start!=end; start++) {
+ 			if (start->second == val)
+ 				return true;
diff --git a/pcr/zoneminder/PKGBUILD b/pcr/zoneminder/PKGBUILD
index 236ceca01..bf03b4133 100644
--- a/pcr/zoneminder/PKGBUILD
+++ b/pcr/zoneminder/PKGBUILD
@@ -1,3 +1,4 @@
+# Maintainer:  Jacek Burghardt           <jacek@hebe.us>
 # Maintainer:  Vojtech Aschenbrenner     <v@asch.cz>
 # Contributor: Jason Gardner             <buhrietoe@gmail.com>
 # Contributor: Ross melin                <rdmelin@gmail.com>
@@ -9,12 +10,13 @@
 pkgbase=zoneminder
 pkgname=zoneminder
 pkgver=1.25.0
-pkgrel=24
+pkgrel=27
 pkgdesc='Capture, analyse, record and monitor video security cameras'
 arch=(
   i686
   x86_64
   mips64el
+  arm
 )
 backup=(
   etc/zm.conf
@@ -26,7 +28,6 @@ license=(
 depends=(
   apache
   cambozola
-  libav-static
   gnutls
   mariadb
   perl-archive-zip
@@ -59,110 +60,67 @@ source=(
   httpd-$pkgbase.conf
   $pkgbase
   $pkgbase.service
+  zoneminder-1.25.0-kernel35.patch
+  zoneminder-1.25.0-gcc47.patch
+  zoneminder-1.25.0-ffmpeg.patch
+  zoneminder-1.25-text.patch
+  zoneminder-1.25-fixwarning.patch
+  zoneminder-1.25.0-gcrypt.patch
 )
 sha512sums=(
   3e18993b0539729491052c97d8c94227ccc089eb40277c2f07682f30049033303c7cfe9734fdac6d33ae67df29c76eb72bf7fbb5dae8227e8831fa603b61c375
   4ce0d8eba9d006d258f5b8a83920fc17f1f602b96518d37b7a47cd9b6eb84ef2587641a6ba839a469c3f0e33b46475866187279ae3f8be0d4054b074ee5d6b08
   ab4e1d5ddaf4d9cd53d6ca59d7965902afd6a2dc830fbbafa270736c52c2b3563075fee860bb0276466f96e9dbfb71b259ac45a4ae2e4ead8eaec154a0159eb0
   cfb0eb87a989236c72741a496ddc6a73aa2696e5beaaca4836d3c231ddb24c7ef5e9f65e7afa49674f2115cbfa4a07c75486e1947ce294c816ddbb875f3b99cf
+  4fa79e49a3c04e9fdc9823792c6a28012002479c77ed41637bd2d21f089e4c15592bfcd5c24028f356c9f80d774a5080a6841e8e70a435d607e3089d0b121775
+  3da7d4d21dea166ea12b49e88a05a9f7a75790881a1f2d7588fa9e0e6ce592b4b5ee71994fa8b05236efeeb57890157a622c752c12a9059c2ee915adf3b4660d
+  7fc2a4663c3103bef641be065bd7992a2b3dc0699f1b99dc2fdb34c1c48e58686e490d3ade523ef7c8e29b3f04109658eef652c26ff6ee3fb9aee65453bdb6c4
+  17b85051543c34a41c6b94ec8f46a10927aa4bc9554562650788c8257ffba8e362500cf3641708f2f9dabebc663a2d012fa9feacd7f9b33c637fbc965d405adf
+  8eab0a922968465fee8537dc035ce781e51dc84cc05259a32acb5bf59c618bc1700dbf4eec90717ed5959841def119357974d109df8d7450c12ca4ea8576e55c
+  8c9e7debcaf60be1c2dda656f95e497f6812d704edc3ca4a1c915a3b3c9dc1749c91d96bc2d60db7d90d5edfd9e2dfc39010dfe4feabfecfffd27f1fffc3d675
 )
 
 build() {
   cd $srcdir/ZoneMinder-$pkgver
-
-  # ZM_RUNDIR need change to run dir
-  export CPPFLAGS=-D__STDC_CONSTANT_MACROS\
-    OPT_FFMPEG=yes\
-    PATH_FFMPEG=/usr/bin/avconv-static\
-    ZM_LOGDIR=/var/log/$pkgbase\
-    ZM_RUNDIR=/tmp/$pkgbase\
-    ZM_SSL_LIB=gnutls\
-    ZM_TMPDIR=/tmp/$pkgbase
-
-  # Patch for GCC 4.7.x
-  sed -i -e 's/^#include <errno.h>/#include <errno.h>\n#include <unistd.h>/'\
-     src/zm_logger.cpp || read
-  sed -i -e 's/^#include <pthread.h>/#include <pthread.h>\n#include <unistd.h>/'\
-     src/zm_thread.h || read
-
-  # Patch for automake 1.12
-  sed -i -e '/am__api_version=/ s/1.11/1.12/'\
-    configure || read
-
-  # Patch for disable ZM_CHECK_FOR_UPDATES
-  sed -i -e '/ZM_CHECK_FOR_UPDATES/,+1 s/yes/no/'\
-    scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in || read
-
-  # Patch for support html5 video and flv
-  sed -i -e '/ZM_MPEG_LIVE_FORMAT/,+1 s/swf/webm/;/ZM_MPEG_REPLAY_FORMAT/,+1 s/swf/webm/;
-    /ZM_FFMPEG_FORMATS/,+1 s/mpg mpeg wmv asf avi\* mov swf 3gp\*\*/mpg mpeg wmv asf avi\* mov flv swf 3gp\*\* webm ogg h264/'\
-    scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in || read
-
-  # Patch for enable video export
-  #sed -i -e '/ZM_OPT_FFMPEG/,+1 s/@OPT_FFMPEG@/yes/;
-  #  /ZM_PATH_FFMPEG/,+1 s/@PATH_FFMPEG@/\/usr\/bin\/avconv-static/'\
-  #  scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in || read
-
-  # Patch for change path run dir
-  sed -i -e '/ZM_PATH_SOCKS/,+1 s/TMP/RUN/'\
-    scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in || read
-
   # Patch for change ZM name to ZoneMinder
   sed -i -e '/ZM_WEB_TITLE_PREFIX/,+1 s/"ZM"/"ZoneMinder"/'\
     scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in || read
-
-  # Patch for v4l2 convert support
-  sed -i -e "s/$ENV{SHELL} = \'\/bin\/sh\' if exists $ENV{SHELL};/$ENV{SHELL} = \'\/bin\/sh\' if exists $ENV{SHELL};\n$ENV{LD_PRELOAD} = \'\/usr\/lib\/libv4l\/v4l2convert.so\' ;/"\
-    scripts/zmdc.pl.in || read
-
-  # Patch for add more socket tries
+  sed -i -e '/am__api_version=/ s/1.11/1.13.1/'\
+        configure || read
+    # Patch for add more socket tries
   sed -i -e '/$max_socket_tries/ s/3/15/'\
-    web/ajax/stream.php || read
-
-  # Patch for wrong "suppported"
+      web/ajax/stream.php || read
+   # Patch for support html5 video and flv
+  sed -i -e '/ZM_MPEG_LIVE_FORMAT/,+1 s/swf/webm/;/ZM_MPEG_REPLAY_FORMAT/,+1 s/swf/webm/;
+     /ZM_FFMPEG_FORMATS/,+1 s/mpg mpeg wmv asf avi\* mov swf 3gp\*\*/mpg mpeg wmv asf avi\* mov flv swf 3gp\*\* webm ogg h264/'\
+     scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in || read
+   # Patch for wrong "suppported"
   sed -i -e 's/suppported/supported/'\
      src/zm_local_camera.cpp || read
+  
 
-  # Patch for type cast in linux-libre kernel 3.5
-  sed -i -e 's/enum v4l2_buf_type type = v4l2_data.fmt.type;/enum v4l2_buf_type type = (v4l2_buf_type)v4l2_data.fmt.type;/'\
-    src/zm_local_camera.cpp || read
-
-  # Patch for drop custom perl install paths
-  sed -i -e '/# Slight hack for non-standard perl install paths/,+10 d;
-    s/^AC_SUBST(ZM_CONFIG,"$SYSCONFDIR\/zm.conf")/AC_SUBST(ZM_CONFIG,"$SYSCONFDIR\/zm.conf")\n\nEXTRA_PERL_LIB="# Include from system perl paths only"\nPERL_MM_PARMS="INSTALLDIRS=vendor"/'\
-    configure.ac
-
-  # Patch for support ffmpeg with <libavutil/mathematics.h> and C library
-  sed -i -e 's/^extern "C" {/extern "C" {\n#ifdef _STDINT_H\n#undef _STDINT_H\n#endif\n#include <stdint.h>/
-    s/^#include <libavutil\/avutil.h>/#include <libavutil\/avutil.h>\n#include <libavutil\/mathematics.h>/'\
-    src/zm_ffmpeg.h
-  sed -i -e 's/^AM_CONFIG_HEADER(config.h)/AM_CONFIG_HEADER(config.h)\n\nAC_SUBST([AM_CXXFLAGS], [-D__STDC_CONSTANT_MACROS])/;
-    s/^AC_CHECK_HEADERS(mysql\/mysql.h,,AC_MSG_ERROR(zm requires MySQL headers - check that MySQL development packages are installed),)/AC_CHECK_HEADERS(mysql\/mysql.h,,AC_MSG_ERROR(zm requires MySQL headers - check that MySQL development packages are installed),)\nAC_LANG_PUSH([C])/;
-    s/^AC_CHECK_HEADERS(libswscale\/swscale.h,,,)/AC_CHECK_HEADERS(libswscale\/swscale.h,,,)\nAC_LANG_POP([C])/'\
-    configure.ac
+   patch -Np1 -F99 -i ../zoneminder-1.25.0-kernel35.patch
+   patch -Np1 -F99 -i ../zoneminder-1.25.0-gcc47.patch 
+   patch -Np1 -F99 -i ../zoneminder-1.25.0-ffmpeg.patch
+   patch -Np1 -F99 -i ../zoneminder-1.25-text.patch   
+   patch -Np1 -F99 -i ../zoneminder-1.25-fixwarning.patch
+   patch -Np1 -F99 -i ../zoneminder-1.25.0-gcrypt.patch
 
-  # Patch for wrong install run, tmp and log dir
-  sed -i -e '/ install-data-hook/d;/install-data-hook:/d;/# Yes, you are correct. This is a HACK!/d;
-    /	( cd $(DESTDIR)$(sysconfdir); chown $(webuser):$(webgroup) $(sysconf_DATA); chmod 600 $(sysconf_DATA) )/d;
-    /	( if ! test -e $(ZM_RUNDIR); then mkdir -p $(ZM_RUNDIR); fi; if test "$(ZM_RUNDIR)" != "\/var\/run"; then chown $(webuser):$(webgroup) $(ZM_RUNDIR); chmod u+w $(ZM_RUNDIR); fi )/d;
-    /	( if ! test -e $(ZM_TMPDIR); then mkdir -m 700 -p $(ZM_TMPDIR); fi; if test "$(ZM_TMPDIR)" != "\/tmp"; then chown $(webuser):$(webgroup) $(ZM_TMPDIR); chmod u+w $(ZM_TMPDIR); fi )/d;
-    /	( if ! test -e $(ZM_LOGDIR); then mkdir -p $(ZM_LOGDIR); fi; if test "$(ZM_LOGDIR)" != "\/var\/log"; then chown $(webuser):$(webgroup) $(ZM_LOGDIR); chmod u+w $(ZM_LOGDIR); fi )/,+1 d'\
-    Makefile.{am,in}
-
-  ./configure --prefix=/usr\
+export CXXFLAGS=-D__STDC_CONSTANT_MACROS
+./configure --prefix=/usr\
     --enable-crashtrace=no\
     --enable-debug=no\
     --enable-mmap=yes\
     --sysconfdir=/etc\
     --with-cgidir=/srv/http/cgi-bin\
     --with-extralibs='-L/usr/lib -L/usr/lib/mysql'\
-    --with-ffmpeg=/opt/libav-static\
     --with-libarch=lib\
+    --with-ffmpeg=/usr \
     --with-mysql=/usr\
     --with-webdir=/srv/http/$pkgbase\
     --with-webgroup=http\
     --with-webhost=localhost\
-    --with-webuser=http
+    --with-webuser=http \
 
   make V=0
 }
@@ -173,8 +131,9 @@ package() {
   make DESTDIR=$pkgdir install
 
   mkdir -p $pkgdir/{etc/{httpd/conf/extra,rc.d},srv/http/{cgi-bin,$pkgbase},usr/{lib/systemd/system,share/{license/$pkgbase,$pkgbase/db}},var/{cache/$pkgbase,log/$pkgbase}}
-
+  mkdir -p $pkgdir/srv/zoneminder/socks
   chown -R http.http $pkgdir/{etc/zm.conf,var/{cache/$pkgbase,log/$pkgbase}}
+  chown -R http.http $pkgdir/srv/zoneminder/socks
   chmod 0700 $pkgdir/etc/zm.conf
 
   for i in events images temp; do
diff --git a/pcr/zoneminder/zoneminder-1.25-fixwarning.patch b/pcr/zoneminder/zoneminder-1.25-fixwarning.patch
new file mode 100644
index 000000000..0d151d139
--- /dev/null
+++ b/pcr/zoneminder/zoneminder-1.25-fixwarning.patch
@@ -0,0 +1,14 @@
+diff -U 3 -H -d -r -N -- ZoneMinder-1.24.2/src/zm_image.cpp ZoneMinder-1.24.2-patch/src/zm_image.cpp
+--- ZoneMinder-1.24.2/src/zm_image.cpp	2009-05-25 20:04:00.000000000 +0200
++++ ZoneMinder-1.24.2-patch/src/zm_image.cpp	2009-07-04 16:31:45.000000000 +0200
+@@ -776,7 +776,8 @@
+ 
+ 		while( pdest < (buffer+size) )
+ 		{
+-			*pdest++ = (*blend_ptr)[*pdest][*psrc++];
++			*pdest = (*blend_ptr)[*pdest][*psrc++];
++			pdest++;
+ 		}
+ 	}
+ 	else
+
diff --git a/pcr/zoneminder/zoneminder-1.25-text.patch b/pcr/zoneminder/zoneminder-1.25-text.patch
new file mode 100644
index 000000000..90885f1b5
--- /dev/null
+++ b/pcr/zoneminder/zoneminder-1.25-text.patch
@@ -0,0 +1,12 @@
+--- ZoneMinder-1.25.0/src/zm_stream.cpp	2009-05-08 09:47:27.000000000 -0400
++++ ZoneMinder-1.25.0.ajs/src/zm_stream.cpp	2013-01-14 16:52:18.000000000 -0500
+@@ -262,7 +262,7 @@ bool StreamBase::sendTextFrame( const ch
+         fprintf( stdout, "--ZoneMinderFrame\r\n" );
+         fprintf( stdout, "Content-Length: %d\r\n", n_bytes );
+         fprintf( stdout, "Content-Type: image/jpeg\r\n\r\n" );
+-        if ( fwrite( buffer, n_bytes, 1, stdout ) )
++        if ( fwrite( buffer, n_bytes, 1, stdout ) != 1 )
+         {
+             Error( "Unable to send stream text frame: %s", strerror(errno) );
+             return( false );
+
diff --git a/pcr/zoneminder/zoneminder-1.25.0-ffmpeg.patch b/pcr/zoneminder/zoneminder-1.25.0-ffmpeg.patch
new file mode 100644
index 000000000..99d41ee33
--- /dev/null
+++ b/pcr/zoneminder/zoneminder-1.25.0-ffmpeg.patch
@@ -0,0 +1,130 @@
+diff -Naur ZoneMinder-1.25.0-a/configure.ac ZoneMinder-1.25.0-b/configure.ac
+--- ZoneMinder-1.25.0-a/configure.ac	2011-08-23 09:10:32.000000000 -0600
++++ ZoneMinder-1.25.0-b/configure.ac	2013-05-06 11:17:33.860608307 -0600
+@@ -95,7 +95,7 @@
+ 
+ LDFLAGS="${FFMPEG_LIBS} $LDFLAGS"
+ CFLAGS="${FFMPEG_CFLAGS} $CFLAGS"
+-CPPFLAGS="${FFMPEG_CFLAGS} $CPPFLAGS"
++CPPFLAGS="${FFMPEG_CFLAGS} $CPPFLAGS -D__STDC_CONSTANT_MACROS"
+ 
+ EXTRA_LIBS=
+ AC_ARG_WITH(extralibs,
+@@ -275,8 +275,7 @@
+ AC_CHECK_LIB(x264,x264_predict_16x16_init)
+ AC_CHECK_LIB(avutil,av_malloc,,AC_MSG_WARN(libavutil.a may be required for MPEG streaming))
+ # Don't bother to warn about this one
+-AC_CHECK_LIB(avcore,av_image_copy,,)
+-AC_CHECK_LIB(avcodec,avcodec_init,,AC_MSG_WARN(libavcodec.a is required for MPEG streaming))
++AC_CHECK_LIB(avcodec,avcodec_register_all,,AC_MSG_WARN(libavcodec.a is required for MPEG streaming))
+ AC_CHECK_LIB(avformat,av_new_stream,,AC_MSG_WARN(libavformat.a is required for MPEG streaming))
+ AC_CHECK_LIB(avdevice,avdevice_register_all,,AC_MSG_WARN(libavdevice.a may be required for MPEG streaming))
+ AC_CHECK_LIB(swscale,sws_scale,,,-lswscale)
+diff -Naur ZoneMinder-1.25.0-a/src/zm_ffmpeg.h ZoneMinder-1.25.0-b/src/zm_ffmpeg.h
+--- ZoneMinder-1.25.0-a/src/zm_ffmpeg.h	2011-06-24 10:05:07.000000000 -0600
++++ ZoneMinder-1.25.0-b/src/zm_ffmpeg.h	2013-05-06 18:11:49.327274977 -0600
+@@ -43,6 +43,11 @@
+ }
+ #endif
+ 
++#include <libavutil/avutil.h>
++#include <libavcodec/avcodec.h>
++#include <libavformat/avformat.h>
++#include <libswscale/swscale.h>
++
+ #if FFMPEG_VERSION_INT == 0x000408
+ #define ZM_FFMPEG_048	1
+ #elif FFMPEG_VERSION_INT == 0x000409
+diff -Naur ZoneMinder-1.25.0-a/src/zm_ffmpeg_camera.cpp ZoneMinder-1.25.0-b/src/zm_ffmpeg_camera.cpp
+--- ZoneMinder-1.25.0-a/src/zm_ffmpeg_camera.cpp	2011-06-21 01:40:13.000000000 -0600
++++ ZoneMinder-1.25.0-b/src/zm_ffmpeg_camera.cpp	2013-05-06 19:57:08.453941643 -0600
+@@ -91,7 +91,7 @@
+     Info( "Priming capture from %s", mPath.c_str() );
+ 
+     // Open the input, not necessarily a file
+-    if ( av_open_input_file( &mFormatContext, mPath.c_str(), NULL, 0, NULL ) !=0 )
++    if ( avformat_open_input( &mFormatContext, mPath.c_str(), NULL, NULL ) !=0 )
+         Fatal( "Unable to open input %s due to: %s", mPath.c_str(), strerror(errno) );
+ 
+     // Locate stream info from input
+@@ -122,7 +122,7 @@
+         Fatal( "Can't find codec for video stream from %s", mPath.c_str() );
+ 
+     // Open the codec
+-    if ( avcodec_open( mCodecContext, mCodec ) < 0 )
++    if ( avcodec_open2( mCodecContext, mCodec, NULL ) < 0 )
+         Fatal( "Unable to open codec for video stream from %s", mPath.c_str() );
+ 
+     // Allocate space for the native video frame
+diff -Naur ZoneMinder-1.25.0-a/src/zm_mpeg.cpp ZoneMinder-1.25.0-b/src/zm_mpeg.cpp
+--- ZoneMinder-1.25.0-a/src/zm_mpeg.cpp	2011-05-15 14:39:06.000000000 -0600
++++ ZoneMinder-1.25.0-b/src/zm_mpeg.cpp	2013-05-06 20:00:08.923941640 -0600
+@@ -130,7 +130,7 @@
+ {
+ 	/* set the output parameters (must be done even if no
+ 	   parameters). */
+-	if ( av_set_parameters(ofc, NULL) < 0 )
++	if ( avformat_write_header(ofc, NULL) < 0 )
+ 	{
+ 		Panic( "Invalid output format parameters" );
+ 	}
+@@ -176,7 +176,7 @@
+ 		}
+ 
+ 		/* open the codec */
+-		if ( avcodec_open(c, codec) < 0 )
++		if ( avcodec_open2(c, codec, NULL) < 0 )
+ 		{
+ 			Panic( "Could not open codec" );
+ 		}
+@@ -222,7 +222,7 @@
+ 	if ( !(of->flags & AVFMT_NOFILE) )
+ 	{
+ #if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(51,2,1)
+-		if ( avio_open(&ofc->pb, filename, URL_WRONLY) < 0 )
++		if ( avio_open(&ofc->pb, filename, AVIO_FLAG_WRITE) < 0 )
+ #else
+ 		if ( url_fopen(&ofc->pb, filename, URL_WRONLY) < 0 )
+ #endif
+@@ -241,7 +241,7 @@
+ 	}
+ 
+ 	/* write the stream header, if any */
+-	av_write_header(ofc);
++	avformat_write_header(ofc, NULL);
+ }
+ 
+ VideoStream::VideoStream( const char *filename, const char *format, int bitrate, double frame_rate, int colours, int width, int height )
+diff -Naur ZoneMinder-1.25.0-a/src/zm_remote_camera_rtsp.cpp ZoneMinder-1.25.0-b/src/zm_remote_camera_rtsp.cpp
+--- ZoneMinder-1.25.0-a/src/zm_remote_camera_rtsp.cpp	2011-06-21 03:19:10.000000000 -0600
++++ ZoneMinder-1.25.0-b/src/zm_remote_camera_rtsp.cpp	2013-05-06 20:07:40.797274975 -0600
+@@ -145,7 +145,7 @@
+         Panic( "Unable to locate codec %d decoder", codecContext->codec_id );
+ 
+     // Open codec
+-    if ( avcodec_open( codecContext, codec ) < 0 )
++    if ( avcodec_open2( codecContext, codec, NULL ) < 0 )
+         Panic( "Can't open codec" );
+ 
+     picture = avcodec_alloc_frame();
+diff -Naur ZoneMinder-1.25.0-a/src/zm_sdp.h ZoneMinder-1.25.0-b/src/zm_sdp.h
+--- ZoneMinder-1.25.0-a/src/zm_sdp.h	2011-05-15 14:39:06.000000000 -0600
++++ ZoneMinder-1.25.0-b/src/zm_sdp.h	2013-05-06 20:23:28.237274974 -0600
+@@ -41,7 +41,7 @@
+         int payloadType;
+         const char payloadName[6];
+         enum AVMediaType codecType;
+-        enum CodecID codecId;
++        enum AVCodecID codecId;
+         int clockRate;
+         int autoChannels;
+     };
+@@ -50,7 +50,7 @@
+     {
+         const char payloadName[32];
+         enum AVMediaType codecType;
+-        enum CodecID codecId;
++        enum AVCodecID codecId;
+         //int clockRate;
+         //int autoChannels;
+     };
diff --git a/pcr/zoneminder/zoneminder-1.25.0-gcc47.patch b/pcr/zoneminder/zoneminder-1.25.0-gcc47.patch
new file mode 100644
index 000000000..a083c6dbc
--- /dev/null
+++ b/pcr/zoneminder/zoneminder-1.25.0-gcc47.patch
@@ -0,0 +1,33 @@
+diff -up ./src/zm_local_camera.cpp.gcc47 ./src/zm_local_camera.cpp
+--- ./src/zm_local_camera.cpp.gcc47	2011-06-21 04:19:10.000000000 -0500
++++ ./src/zm_local_camera.cpp	2012-01-19 13:43:49.142440717 -0600
+@@ -26,6 +26,7 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <fcntl.h>
++#include <limits.h>
+ #include <unistd.h>
+ #include <sys/mman.h>
+ #include <errno.h>
+diff -up ./src/zm_logger.cpp.gcc47 ./src/zm_logger.cpp
+--- ./src/zm_logger.cpp.gcc47	2011-06-28 06:07:35.000000000 -0500
++++ ./src/zm_logger.cpp	2012-01-19 13:43:49.142440717 -0600
+@@ -33,6 +33,7 @@
+ #include <signal.h>
+ #include <stdarg.h>
+ #include <errno.h>
++#include <unistd.h>
+ 
+ bool Logger::smInitialised = false;
+ Logger *Logger::smInstance = 0;
+diff -up ./src/zm_thread.h.gcc47 ./src/zm_thread.h
+--- ./src/zm_thread.h.gcc47	2012-01-19 13:44:43.082766722 -0600
++++ ./src/zm_thread.h	2012-01-19 13:44:56.966335869 -0600
+@@ -21,6 +21,7 @@
+ #define ZM_THREAD_H
+ 
+ #include <pthread.h>
++#include <unistd.h>
+ #include "zm_exception.h"
+ #include "zm_utils.h"
+ 
diff --git a/pcr/zoneminder/zoneminder-1.25.0-gcrypt.patch b/pcr/zoneminder/zoneminder-1.25.0-gcrypt.patch
new file mode 100644
index 000000000..21f197ec6
--- /dev/null
+++ b/pcr/zoneminder/zoneminder-1.25.0-gcrypt.patch
@@ -0,0 +1,86 @@
+diff -up ./configure.ac.gcrypt ./configure.ac
+--- ./configure.ac.gcrypt	2012-01-19 12:58:20.647123209 -0600
++++ ./configure.ac	2012-01-19 13:12:34.186669577 -0600
+@@ -13,7 +13,7 @@ AC_ARG_VAR(ZM_DB_HOST,[Hostname where Zo
+ AC_ARG_VAR(ZM_DB_NAME,[Name of ZoneMinder database, default zm])
+ AC_ARG_VAR(ZM_DB_USER,[Name of ZoneMinder database user, default zmuser])
+ AC_ARG_VAR(ZM_DB_PASS,[Password of ZoneMinder database user, default zmpass])
+-AC_ARG_VAR(ZM_SSL_LIB,[Library to use for ssl functions, default gnutls])
++AC_ARG_VAR(ZM_SSL_LIB,[Library to use for MD5 function, default libgcrypt])
+ AC_ARG_VAR(ZM_MYSQL_ENGINE,[MySQL engine to use with database, default MyISAM])
+ AC_ARG_VAR(ZM_RUNDIR,[Location of transient process files, default /var/run/zm])
+ AC_ARG_VAR(ZM_TMPDIR,[Location of temporary files, default /tmp/zm])
+@@ -32,7 +32,7 @@ if test "$ZM_DB_PASS" == ""; then
+ 	AC_SUBST(ZM_DB_PASS,[zmpass])
+ fi
+ if test "$ZM_SSL_LIB" == ""; then
+-	AC_SUBST(ZM_SSL_LIB,gnutls)
++	AC_SUBST(ZM_SSL_LIB,libgcrypt)
+ fi
+ if test "$ZM_MYSQL_ENGINE" == ""; then
+ 	AC_SUBST(ZM_MYSQL_ENGINE,MyISAM)
+@@ -264,11 +264,10 @@ AC_CHECK_LIB(jpeg,jpeg_start_compress,,A
+ AC_CHECK_LIB(pthread,pthread_create,,AC_MSG_ERROR(zm requires libpthread.a))
+ AC_CHECK_LIB(dl,dlsym,,AC_MSG_ERROR(zm requires libdl.a))
+ if test "$ZM_SSL_LIB" == "openssl"; then
+-AC_CHECK_LIB(crypto,MD5,,AC_MSG_WARN([libcrypto.a is required for authenticated streaming - use ZM_SSL_LIB option to select gnutls instead]))
++AC_CHECK_LIB(crypto,MD5,,AC_MSG_WARN([libcrypto.a is required for authenticated streaming - use ZM_SSL_LIB option to select libgcrypt instead]))
+ else
+-AC_CHECK_HEADERS(gcrypt.h,,AC_MSG_WARN(zm requires libgcrypt headers to be installed for gnutls),)
++AC_CHECK_HEADERS(gcrypt.h,,AC_MSG_WARN(zm requires libgcrypt headers to be installed),)
+ AC_CHECK_LIB(gcrypt,gcry_check_version,,AC_MSG_WARN([libgcrypt.a is required for authenticated streaming - use ZM_SSL_LIB option to select openssl instead]))
+-AC_CHECK_LIB(gnutls-openssl,MD5,,AC_MSG_WARN([gnutls-openssl.a is required for authenticated streaming - use ZM_SSL_LIB option to select openssl instead]))
+ fi
+ AC_CHECK_LIB(pcre,pcre_compile,,AC_MSG_WARN(libpcre.a may be required for remote/network camera support))
+ AC_CHECK_LIB(z,zlibVersion)
+@@ -320,9 +319,6 @@ AC_CHECK_DECLS(round,,,[#include <math.h
+ if test "$ZM_SSL_LIB" == "openssl"; then
+ AC_CHECK_DECLS(MD5,,AC_MSG_ERROR([zm requires openssl/md5.h - use ZM_SSL_LIB option to select gnutls instead]),[#include <stdlib.h>
+ #include <openssl/md5.h>])
+-else
+-AC_CHECK_DECLS(MD5,,AC_MSG_ERROR([zm requires gnutls/openssl.h - use ZM_SSL_LIB option to select openssl instead]),[#include <stdlib.h>
+-#include <gnutls/openssl.h>])
+ fi
+ AC_CHECK_DECLS(backtrace,,,[#include <execinfo.h>])
+ 
+diff -up ./src/zm_user.cpp.gcrypt ./src/zm_user.cpp
+--- ./src/zm_user.cpp.gcrypt	2011-08-03 06:31:06.000000000 -0500
++++ ./src/zm_user.cpp	2012-01-19 12:58:20.654122992 -0600
+@@ -140,6 +140,18 @@ User *zmLoadUser( const char *username, 
+ 	return( user );
+ }
+ 
++#ifdef HAVE_GCRYPT_H
++#define HAVE_DECL_MD5 1
++#define MD5_DIGEST_LENGTH 16
++static unsigned char *MD5(const unsigned char *data, unsigned long len,
++                         unsigned char *md)
++{
++    gcry_md_hash_buffer(GCRY_MD_MD5, md, data, len);
++
++    return md;
++}
++#endif
++
+ // Function to validate an authentication string
+ User *zmLoadAuthUser( const char *auth, bool use_remote_addr )
+ {
+diff -up ./src/zm_user.h.gcrypt ./src/zm_user.h
+--- ./src/zm_user.h.gcrypt	2010-11-11 06:11:07.000000000 -0600
++++ ./src/zm_user.h	2012-01-19 13:14:11.200654694 -0600
+@@ -23,14 +23,11 @@
+ #ifndef ZM_USER_H

+ #define ZM_USER_H

+ 

+-#if HAVE_LIBGNUTLS_OPENSSL

+-#include <gnutls/openssl.h>

+ #if HAVE_GCRYPT_H

+ #include <gcrypt.h>

+-#endif // HAVE_GCRYPT_H

+ #elif HAVE_LIBCRYPTO

+ #include <openssl/md5.h>

+-#endif // HAVE_LIBGNUTLS_OPENSSL || HAVE_LIBCRYPTO

++#endif // HAVE_GCRYPT_H || HAVE_LIBCRYPTO

+ 

+ class User

+ {

diff --git a/pcr/zoneminder/zoneminder-1.25.0-kernel35.patch b/pcr/zoneminder/zoneminder-1.25.0-kernel35.patch
new file mode 100644
index 000000000..51bc1288d
--- /dev/null
+++ b/pcr/zoneminder/zoneminder-1.25.0-kernel35.patch
@@ -0,0 +1,21 @@
+diff -up ./src/zm_local_camera.cpp.kernel35 ./src/zm_local_camera.cpp
+--- ./src/zm_local_camera.cpp.kernel35	2012-07-16 15:01:22.182614878 -0500
++++ ./src/zm_local_camera.cpp	2012-07-16 15:02:16.491941730 -0500
+@@ -740,7 +740,7 @@ void LocalCamera::Terminate()
+     {
+         Debug( 3, "Terminating video stream" );
+         //enum v4l2_buf_type type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+-        enum v4l2_buf_type type = v4l2_data.fmt.type;
++        enum v4l2_buf_type type = (v4l2_buf_type)v4l2_data.fmt.type;
+         if ( vidioctl( vid_fd, VIDIOC_STREAMOFF, &type ) < 0 )
+             Error( "Failed to stop capture stream: %s", strerror(errno) );
+ 
+@@ -1520,7 +1520,7 @@ int LocalCamera::PrimeCapture()
+ 
+         Debug( 3, "Starting video stream" );
+         //enum v4l2_buf_type type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+-        enum v4l2_buf_type type = v4l2_data.fmt.type;
++        enum v4l2_buf_type type = (v4l2_buf_type)v4l2_data.fmt.type;
+         if ( vidioctl( vid_fd, VIDIOC_STREAMON, &type ) < 0 )
+             Fatal( "Failed to start capture stream: %s", strerror(errno) );
+     }
diff --git a/pcr/zoneminder/zoneminder.install b/pcr/zoneminder/zoneminder.install
index ecacf6437..899e2a5d1 100644
--- a/pcr/zoneminder/zoneminder.install
+++ b/pcr/zoneminder/zoneminder.install
@@ -69,9 +69,6 @@ post_install() {
     /^open_basedir/ s/:\/srv\/http\/zoneminder//;
     /^open_basedir/ s/:\/srv\/http\/zoneminder\///;
     /^open_basedir/ s/$/:\/srv\/http\/zoneminder/;
-    /^open_basedir/ s/:\/var\/cache\/zoneminder//;
-    /^open_basedir/ s/:\/var\/cache\/zoneminder\///;
-    /^open_basedir/ s/$/:\/var\/cache\/zoneminder/;
     ' /etc/php/php.ini || read
   sed -i -e '
     /^LoadModule php5_module modules\/libphp5.so/d;
@@ -82,7 +79,6 @@ post_install() {
     /^Include \/etc\/httpd\/conf\/extra\/httpd-zoneminder.conf/d;
     /^Include conf\/extra\/httpd-default.conf/ s/$/\n\n# PHP 5\n\Include \/etc\/httpd\/conf\/extra\/php5_module.conf\n\n# ZoneMinder\nInclude \/etc\/httpd\/conf\/extra\/httpd-zoneminder.conf/;
     ' /etc/httpd/conf/httpd.conf || read
-  gpasswd -a http video
   cat << EOF
 Note for mysql:
 ==> To run Zoneminder, you must install the database running mysql service (as root):
@@ -109,11 +105,11 @@ Note for php:
 ==> "extension=openssl.so"
 ==> "extension=ftp.so"
 ==> "extension=zip.so"
-==> check and add to open_basedir "/etc", 
-==> "/srv/http/zoneminder" and "/var/cache/zoneminder" like so
-==> "open_basedir = /home:/tmp:/usr/share/pear:/etc:/srv/http/zoneminder:/var/cache/zoneminder"
+==> check and add to open_basedir "/etc" and
+==> "/srv/http/zoneminder" like so
+==> "open_basedir = /home:/tmp:/usr/share/pear:/etc:/srv/http/zoneminder"
 ==> and set your timezone in php.ini:
-==> "date.timezone = <your_zone>/<your_city>"
+==> "date.timezone = <your_country>/<your_city>"
 
 Note for apache:
 ==> You must edit /etc/httpd/conf/httpd.conf and add the line:
@@ -136,7 +132,6 @@ post_remove() {
   sed -i -e '
     /^open_basedir/ s/:\/srv\/http\/zoneminder//;
     /^open_basedir/ s/:\/srv\/http\/zoneminder\///;
-    /^open_basedir/ s/:\/var\/cache\/zoneminder\///
     ' /etc/php/php.ini || read
   sed -i -e '
     /^# ZoneMinder/d;
@@ -170,12 +165,9 @@ Note:
 ==> "extension=mysqli.so"
 ==> "extension=session.so"
 ==> "extension=sockets.so"
-==> "date.timezone = <my_zone>/<my_city>"
+==> "date.timezone = <my_country>/<my_city>"
 
-==> Drop http user on video group if it isn't needed with others servers:
-==> gpasswd -d http video
-
-==> Edit /etc/php/php.ini and remove "/etc", "/srv/http/zoneminder" and "/var/cache/zoneminder"
+==> Edit /etc/php/php.ini and remove "/etc" and "/srv/http/zoneminder"
 ==> in the "open_basedir".
 
 ==> Remove log files and "zonemider" directory in "/var/log/zoneminder".