Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/erlang/PKGBUILD
	community/mcabber/PKGBUILD
	community/smem/PKGBUILD
	community/uqm/PKGBUILD
	extra/bitlbee/PKGBUILD
	extra/gvfs/PKGBUILD
	extra/gweled/PKGBUILD
	extra/libmikmod/PKGBUILD
	extra/sdl_sound/PKGBUILD
	extra/xmms/PKGBUILD
	libre/gnu-ghostscript/PKGBUILD
	libre/libretools/PKGBUILD

9 files changed, 192 insertions, 45 deletions

diff --git a/pcr/irssi-xmpp/PKGBUILD b/pcr/irssi-xmpp/PKGBUILD
new file mode 100644
index 000000000..fa5d445c6
--- /dev/null
+++ b/pcr/irssi-xmpp/PKGBUILD
@@ -0,0 +1,22 @@
+# Maintainer: Yogesh Powar <yogesh.powar@gmail.com>
+pkgname=irssi-xmpp
+pkgver=0.52
+pkgrel=1
+pkgdesc="An irssi plugin to connect to the Jabber network."
+url="http://cybione.org/~irssi-xmpp"
+arch=('i686' 'x86_64' 'mips64el')
+license=('GPL')
+depends=('loudmouth>=1.4.0' 'irssi>=0.8.13')
+source=("http://cybione.org/~irssi-xmpp/files/${pkgname}-${pkgver}.tar.gz")
+md5sums=('f48d66ddf6a6d8e4d04bfc44b83dc3c7')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+  export PREFIX=/usr/
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir/" install
+}
diff --git a/pcr/libav-static/PKGBUILD b/pcr/libav-static/PKGBUILD
new file mode 100644
index 000000000..932213a3e
--- /dev/null
+++ b/pcr/libav-static/PKGBUILD
@@ -0,0 +1,120 @@
+# $Id$
+# Maintainer : Ionut Biru <ibiru@archlinux.org>
+# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
+# Contributor: Paul Mattal <paul@archlinux.org>
+# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
+
+pkgbase=libav
+pkgname=libav-static
+pkgflag=-static
+pkgver=0.8.4
+pkgrel=2
+pkgdesc='Complete and free Internet live audio and video broadcasting solution for GNU/Linux, with static library'
+arch=(
+  i686
+  x86_64
+  mips64el
+)
+url="http://$pkgbase.org/"
+license=(
+  GPL
+)
+depends=(
+  alsa-lib
+  bzip2
+  gsm
+  lame
+  libpulse
+  libtheora
+  libva
+  libvorbis
+  libvpx
+  opencore-amr
+  openjpeg
+  rtmpdump
+  schroedinger
+  sdl
+  speex
+  x264
+  xvidcore
+  zlib
+)
+makedepends=(
+  yasm
+  libvdpau
+)
+source=(
+  http://$pkgbase.org/releases/$pkgbase-$pkgver.tar.gz
+  avconv$pkgflag
+  avplay$pkgflag
+  avprobe$pkgflag
+  avserver$pkgflag
+  ffmpeg-$pkgname
+  qt-faststart-$pkgname
+)
+sha512sums=(
+  d402c7d586708e29b92340c4d03d8431fe607f0b88c2762cc95671786cdb9a7221968164b571e11086b53b2169f3a657c6106dc769c04a1a035429d011e72610
+  4a98c459df5f5bc5e42580b5f2081509719c057fdf55693b3554006b21adcaa29ee59ac0debfe0486fe1df8b9a937135d99e4ccc2df894a2634dd314eed93114
+  afd2eadd0a0522cd3665ccd2b819f06a99cc50e3bdac3a0ef200861664c7084cc5990a3c1a860f2f0cc9f835c33c09cb5c57a25dbab0673eb74ba0f4c980e539
+  4e557c9eab6a97a3206df1dd49a516ae7be9490c894ff212cb5286ee097ae606c0b7a650c75278a71e4c91d0325eaee729937e1ae659ce0887c3c20ea8fe6333
+  f0fa50711d19babf3f485189fb37b17a87f31849dad9cf6a7324601bdde0856fe47d55a4d82c6839c93f39e970edcbeecfbcb70a8b4e7570250fa4c7bb6975fb
+  8101ec9c3e0a945ea89f85f81ace52ce67159661e3440668726a5767ba6250a91533494f1aa8fc30ee97ff9af5d64636d0f0dbcb2da862124d35b6b5ec571f5b
+  0133fae31e1df586317deb7235f5e74d22abd007038f82b9df10ea3eea6748945c50a0bbe8f588e8a5d1b7874b3fa2639430e1efa32b0cfe16383a32751d3245
+)
+
+build() {
+  cd $pkgbase-$pkgver
+
+  ./configure \
+    --prefix=/opt/$pkgname \
+    --enable-libmp3lame \
+    --enable-libvorbis \
+    --enable-libxvid \
+    --enable-libx264 \
+    --enable-libvpx \
+    --enable-libtheora \
+    --enable-libgsm \
+    --enable-libspeex \
+    --enable-postproc \
+    --enable-shared \
+    --enable-x11grab \
+    --enable-libopencore_amrnb \
+    --enable-libopencore_amrwb \
+    --enable-libschroedinger \
+    --enable-libopenjpeg \
+    --enable-librtmp \
+    --enable-libpulse \
+    --enable-gpl \
+    --enable-version3 \
+    --enable-runtime-cpudetect \
+    --disable-debug \
+    --enable-static
+
+  make
+  make tools/qt-faststart
+  make doc/ffmpeg.1
+  make doc/av{play,server}.1
+}
+
+package() {
+  cd $pkgbase-$pkgver
+  make DESTDIR=$pkgdir install install-man
+  install -m755 -d                              $pkgdir/etc/ld.so.conf.d
+  install -m755 -d                              $pkgdir/usr/bin
+  install -m755 -d                              $pkgdir/usr/share/man/man1
+  install -Dm755 tools/qt-faststart             $pkgdir/opt/$pkgname/bin
+  ln -s /opt/$pkgname/bin/avconv                $pkgdir/usr/bin/avconv$pkgflag
+  ln -s /opt/$pkgname/bin/avplay                $pkgdir/usr/bin/avplay$pkgflag
+  ln -s /opt/$pkgname/bin/avprobe               $pkgdir/usr/bin/avprobe$pkgflag
+  ln -s /opt/$pkgname/bin/avserver              $pkgdir/usr/bin/avserver$pkgflag
+  ln -s /opt/$pkgname/bin/ffmpeg                $pkgdir/usr/bin/ffmpeg-$pkgname
+  ln -s /opt/$pkgname/bin/qt-faststart          $pkgdir/usr/bin/qt-faststart-$pkgname
+  ln -s /opt/$pkgname/share/man/man1/avconv.1   $pkgdir/usr/share/man/man1/avconv$pkgflag.1
+  ln -s /opt/$pkgname/share/man/man1/avplay.1   $pkgdir/usr/share/man/man1/avplay$pkgflag.1
+  ln -s /opt/$pkgname/share/man/man1/avprobe.1  $pkgdir/usr/share/man/man1/avprobe$pkgflag.1
+  ln -s /opt/$pkgname/share/man/man1/avserver.1 $pkgdir/usr/share/man/man1/avserver$pkgflag.1
+  ln -s /opt/$pkgname/share/man/man1/ffmpeg.1   $pkgdir/usr/share/man/man1/ffmpeg-$pkgname.1
+  echo /opt/libav-static/lib                  > $pkgdir/etc/ld.so.conf.d/libav-static.conf
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/pcr/libav-static/avconv-static b/pcr/libav-static/avconv-static
new file mode 100644
index 000000000..5f632bec0
--- /dev/null
+++ b/pcr/libav-static/avconv-static
@@ -0,0 +1,2 @@
+#!/bin/bash
+LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/libav-static/lib /opt/libav-static/bin/avconv $*
diff --git a/pcr/libav-static/avplay-static b/pcr/libav-static/avplay-static
new file mode 100644
index 000000000..8db2da816
--- /dev/null
+++ b/pcr/libav-static/avplay-static
@@ -0,0 +1,2 @@
+#!/bin/bash
+LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/libav-static/lib /opt/libav-static/bin/avplay $*
diff --git a/pcr/libav-static/avprobe-static b/pcr/libav-static/avprobe-static
new file mode 100644
index 000000000..44b730287
--- /dev/null
+++ b/pcr/libav-static/avprobe-static
@@ -0,0 +1,2 @@
+#!/bin/bash
+LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/libav-static/lib /opt/libav-static/bin/avprobe $*
diff --git a/pcr/libav-static/avserver-static b/pcr/libav-static/avserver-static
new file mode 100644
index 000000000..642d4722c
--- /dev/null
+++ b/pcr/libav-static/avserver-static
@@ -0,0 +1,2 @@
+#!/bin/bash
+LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/libav-static/lib /opt/libav-static/bin/avserver $*
diff --git a/pcr/libav-static/ffmpeg-libav-static b/pcr/libav-static/ffmpeg-libav-static
new file mode 100644
index 000000000..3f9ef6d52
--- /dev/null
+++ b/pcr/libav-static/ffmpeg-libav-static
@@ -0,0 +1,2 @@
+#!/bin/bash
+LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/libav-static/lib /opt/libav-static/bin/ffmpeg $*
diff --git a/pcr/libav-static/qt-faststart-libav-static b/pcr/libav-static/qt-faststart-libav-static
new file mode 100644
index 000000000..8613091c4
--- /dev/null
+++ b/pcr/libav-static/qt-faststart-libav-static
@@ -0,0 +1,2 @@
+#!/bin/bash
+LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/libav-static/lib /opt/libav-static/bin/qt-faststart $*
diff --git a/pcr/zoneminder/PKGBUILD b/pcr/zoneminder/PKGBUILD
index a008bcc6c..236ceca01 100644
--- a/pcr/zoneminder/PKGBUILD
+++ b/pcr/zoneminder/PKGBUILD
@@ -6,9 +6,10 @@
 
 # based of debian squeeze package
 
+pkgbase=zoneminder
 pkgname=zoneminder
 pkgver=1.25.0
-pkgrel=21
+pkgrel=24
 pkgdesc='Capture, analyse, record and monitor video security cameras'
 arch=(
   i686
@@ -18,16 +19,16 @@ arch=(
 backup=(
   etc/zm.conf
 )
-url="http://www.$pkgname.com"
+url="http://www.$pkgbase.com"
 license=(
   GPL
 )
 depends=(
   apache
   cambozola
-  ffmpeg-static
+  libav-static
   gnutls
-  mysql
+  mariadb
   perl-archive-zip
   perl-date-manip
   perl-dbd-mysql
@@ -52,20 +53,18 @@ makedepends=(
 optdepends=(
   netpbm
 )
-install=$pkgname.install
+install=$pkgbase.install
 source=(
-  http://www.$pkgname.com/downloads/ZoneMinder-$pkgver.tar.gz
-  httpd-$pkgname.conf
-  $pkgname
-  $pkgname.service
-  patch-ffmpeg-0.11.patch
+  http://www.$pkgbase.com/downloads/ZoneMinder-$pkgver.tar.gz
+  httpd-$pkgbase.conf
+  $pkgbase
+  $pkgbase.service
 )
 sha512sums=(
   3e18993b0539729491052c97d8c94227ccc089eb40277c2f07682f30049033303c7cfe9734fdac6d33ae67df29c76eb72bf7fbb5dae8227e8831fa603b61c375
   4ce0d8eba9d006d258f5b8a83920fc17f1f602b96518d37b7a47cd9b6eb84ef2587641a6ba839a469c3f0e33b46475866187279ae3f8be0d4054b074ee5d6b08
   ab4e1d5ddaf4d9cd53d6ca59d7965902afd6a2dc830fbbafa270736c52c2b3563075fee860bb0276466f96e9dbfb71b259ac45a4ae2e4ead8eaec154a0159eb0
   cfb0eb87a989236c72741a496ddc6a73aa2696e5beaaca4836d3c231ddb24c7ef5e9f65e7afa49674f2115cbfa4a07c75486e1947ce294c816ddbb875f3b99cf
-  382799ad6add1632d934544230520f942dae37913b58cfa19e0cb2b11e7002267b1fdb9aa535f2217bcccf0c85c4d754f316dc3980a3ca267e5b3f5500536024
 )
 
 build() {
@@ -73,10 +72,12 @@ build() {
 
   # ZM_RUNDIR need change to run dir
   export CPPFLAGS=-D__STDC_CONSTANT_MACROS\
-    ZM_LOGDIR=/var/log/$pkgname\
-    ZM_RUNDIR=/tmp/$pkgname\
+    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/$pkgname
+    ZM_TMPDIR=/tmp/$pkgbase
 
   # Patch for GCC 4.7.x
   sed -i -e 's/^#include <errno.h>/#include <errno.h>\n#include <unistd.h>/'\
@@ -94,9 +95,14 @@ build() {
 
   # 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 h254/'\
+    /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
@@ -105,8 +111,8 @@ build() {
   sed -i -e '/ZM_WEB_TITLE_PREFIX/,+1 s/"ZM"/"ZoneMinder"/'\
     scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in || read
 
-  # Patch for v4l1 compat 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\/v4l1compat.so\' ;/"\
+  # 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
@@ -126,19 +132,6 @@ build() {
     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 new ffmpeg
-  patch -p1 < $srcdir/patch-ffmpeg-0.11.patch
-#  sed -i -e 's/if ( av_open_input_file( \&mFormatContext, mPath.c_str(), NULL, 0, NULL ) !=0 )/if ( avformat_open_input( \&mFormatContext, mPath.c_str(), NULL, NULL ) !=0 )/;
-#    s/if ( avcodec_open( mCodecContext, mCodec ) < 0 )/if ( avcodec_open2( mCodecContext, mCodec, NULL ) < 0 )/'\
-#    src/zm_ffmpeg_camera.cpp
-#  sed -i -e 's/if ( av_set_parameters(ofc, NULL) < 0 )/\/\*\n     \* Removed in last ffmpeg\n     \* if ( av_set_parameters(ofc, NULL) < 0 )/;
-#    /Panic( "Invalid output format parameters" );/,+1 s/}/}\*/;
-#    /if ( avio_open(&ofc->pb, filename, URL_WRONLY) < 0 )/ s/URL_WRONLY/AVIO_FLAG_WRITE/;
-#    s/av_write_header(ofc);/avformat_write_header(ofc, NULL);/'\
-#    src/zm_mpeg.cpp
-  sed -i -e 's/avcodec_init/avcodec_open/'\
-    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>/'\
@@ -163,10 +156,10 @@ build() {
     --sysconfdir=/etc\
     --with-cgidir=/srv/http/cgi-bin\
     --with-extralibs='-L/usr/lib -L/usr/lib/mysql'\
-    --with-ffmpeg=/usr\
+    --with-ffmpeg=/opt/libav-static\
     --with-libarch=lib\
     --with-mysql=/usr\
-    --with-webdir=/srv/http/$pkgname\
+    --with-webdir=/srv/http/$pkgbase\
     --with-webgroup=http\
     --with-webhost=localhost\
     --with-webuser=http
@@ -179,25 +172,25 @@ package() {
 
   make DESTDIR=$pkgdir install
 
-  mkdir -p $pkgdir/{etc/{httpd/conf/extra,rc.d},srv/http/{cgi-bin,$pkgname},usr/{lib/systemd/system,share/{license/$pkgname,$pkgname/db}},var/{cache/$pkgname,log/$pkgname}}
+  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}}
 
-  chown -R http.http $pkgdir/{etc/zm.conf,var/{cache/$pkgname,log/$pkgname}}
+  chown -R http.http $pkgdir/{etc/zm.conf,var/{cache/$pkgbase,log/$pkgbase}}
   chmod 0700 $pkgdir/etc/zm.conf
 
   for i in events images temp; do
-    mv    $pkgdir/srv/http/$pkgname/$i $pkgdir/var/cache/$pkgname/$i
-    ln -s /var/cache/$pkgname/$i       $pkgdir/srv/http/$pkgname/$i
-    chown -h http.http                 $pkgdir/srv/http/$pkgname/$i
+    mv    $pkgdir/srv/http/$pkgbase/$i $pkgdir/var/cache/$pkgbase/$i
+    ln -s /var/cache/$pkgbase/$i       $pkgdir/srv/http/$pkgbase/$i
+    chown -h http.http                 $pkgdir/srv/http/$pkgbase/$i
   done
 
-  ln -s /srv/http/cgi-bin                  $pkgdir/srv/http/$pkgname
-  chown -h http.http                       $pkgdir/srv/http/{cgi-bin,$pkgname,$pkgname/cgi-bin}
+  ln -s /srv/http/cgi-bin                  $pkgdir/srv/http/$pkgbase
+  chown -h http.http                       $pkgdir/srv/http/{cgi-bin,$pkgbase,$pkgbase/cgi-bin}
 
-  ln -s /usr/share/cambozola/cambozola.jar $pkgdir/srv/http/$pkgname
+  ln -s /usr/share/cambozola/cambozola.jar $pkgdir/srv/http/$pkgbase
 
-  install -D -m 644 $srcdir/httpd-$pkgname.conf $pkgdir/etc/httpd/conf/extra
-  install -D -m 644 $srcdir/$pkgname            $pkgdir/etc/rc.d
-  install -D -m 644 $srcdir/$pkgname.service    $pkgdir/usr/lib/systemd/system
-  install -D -m 644 COPYING                     $pkgdir/usr/share/license/$pkgname
-  install -D -m 644 db/zm*.sql                  $pkgdir/usr/share/$pkgname/db
+  install -D -m 644 $srcdir/httpd-$pkgbase.conf $pkgdir/etc/httpd/conf/extra
+  install -D -m 644 $srcdir/$pkgbase            $pkgdir/etc/rc.d
+  install -D -m 644 $srcdir/$pkgbase.service    $pkgdir/usr/lib/systemd/system
+  install -D -m 644 COPYING                     $pkgdir/usr/share/license/$pkgbase
+  install -D -m 644 db/zm*.sql                  $pkgdir/usr/share/$pkgbase/db
 }