From 08251af6f167ec35b8c2e4039ed090fad493a23e Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado <emulatorman@lavabit.com>
Date: Tue, 23 Jul 2013 05:01:39 -0300
Subject: rebuild packages against linux-libre-3.10.2-1

---
 libre/bbswitch-libre/PKGBUILD           | 2 +-
 libre/lirc-libre/PKGBUILD               | 4 ++--
 libre/tp_smapi-libre/PKGBUILD           | 4 ++--
 libre/vhba-module-libre/PKGBUILD        | 4 ++--
 libre/virtualbox-libre-modules/PKGBUILD | 6 +++---
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/libre/bbswitch-libre/PKGBUILD b/libre/bbswitch-libre/PKGBUILD
index a456c29cc..eadfd8214 100644
--- a/libre/bbswitch-libre/PKGBUILD
+++ b/libre/bbswitch-libre/PKGBUILD
@@ -7,7 +7,7 @@ _pkgname=bbswitch
 pkgname=bbswitch-libre
 pkgver=0.7
 _extramodules=extramodules-3.10-LIBRE # Don't forget to update bbswitch.install
-pkgrel=5
+pkgrel=6
 pkgdesc="Kernel module allowing to switch dedicated graphics card on Optimus laptops (built for the linux-libre kernel package)"
 arch=('i686' 'x86_64' 'mips64el')
 url=("http://github.com/Bumblebee-Project/bbswitch")
diff --git a/libre/lirc-libre/PKGBUILD b/libre/lirc-libre/PKGBUILD
index 86f5e4052..d7a86197a 100644
--- a/libre/lirc-libre/PKGBUILD
+++ b/libre/lirc-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 189780 2013-07-08 07:36:42Z tpowa $
+# $Id: PKGBUILD 191260 2013-07-22 12:53:01Z tpowa $
 # Maintainer: Paul Mattal <paul@archlinux.org>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 
@@ -6,7 +6,7 @@ _pkgbase=lirc
 pkgbase=lirc-libre
 pkgname=('lirc-libre' 'lirc-utils-libre')
 pkgver=0.9.0
-pkgrel=51
+pkgrel=52
 epoch=1
 _extramodules=extramodules-3.10-LIBRE
 arch=('i686' 'x86_64' 'mips64el')
diff --git a/libre/tp_smapi-libre/PKGBUILD b/libre/tp_smapi-libre/PKGBUILD
index 17d848228..138962ca3 100644
--- a/libre/tp_smapi-libre/PKGBUILD
+++ b/libre/tp_smapi-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 93342 2013-07-02 05:44:07Z tpowa $
+# $Id: PKGBUILD 94377 2013-07-22 13:48:54Z tpowa $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: xduugu
 # Contributor: nh2
@@ -12,7 +12,7 @@
 _pkgname=tp_smapi
 pkgname=tp_smapi-libre
 pkgver=0.41
-pkgrel=26
+pkgrel=27
 pkgdesc="Modules for ThinkPad's SMAPI functionality (built for the linux-libre kernel package)"
 arch=('i686' 'x86_64' 'mips64el')
 url='https://github.com/evgeni/tp_smapi'
diff --git a/libre/vhba-module-libre/PKGBUILD b/libre/vhba-module-libre/PKGBUILD
index a6212ed15..0f2f8b581 100644
--- a/libre/vhba-module-libre/PKGBUILD
+++ b/libre/vhba-module-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 93344 2013-07-02 05:45:16Z tpowa $
+# $Id: PKGBUILD 94379 2013-07-22 13:49:30Z tpowa $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: Mateusz Herych <heniekk@gmail.com>
 # Contributor: Charles Lindsay <charles@chaoslizard.org>
@@ -8,7 +8,7 @@ _pkgname=vhba-module
 pkgname=vhba-module-libre
 pkgver=20130607
 _extramodules=extramodules-3.10-LIBRE
-pkgrel=5
+pkgrel=6
 pkgdesc="Kernel module that emulates SCSI devices (built for the linux-libre kernel package)"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://cdemu.sourceforge.net/"
diff --git a/libre/virtualbox-libre-modules/PKGBUILD b/libre/virtualbox-libre-modules/PKGBUILD
index 1b0d9c639..e7278298b 100644
--- a/libre/virtualbox-libre-modules/PKGBUILD
+++ b/libre/virtualbox-libre-modules/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 93541 2013-07-05 07:07:43Z foutrelis $
+# $Id: PKGBUILD 94381 2013-07-22 13:58:51Z tpowa $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 # Maintainer: Sébastien Luttringer
 # Maintainer (Parabola): Jorge López <jorginho@lavabit.com>
@@ -7,12 +7,12 @@
 pkgbase=virtualbox-libre-modules
 pkgname=('virtualbox-libre-host-modules' 'virtualbox-libre-guest-modules')
 pkgver=4.2.16
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
 license=('GPL')
 makedepends=('linux-libre>=3.10' 'linux-libre<3.11'
-             'linux-libre-headers' 'linux-libre-headers<3.11'
+             'linux-libre-headers>=3.10' 'linux-libre-headers<3.11'
              "virtualbox-libre-host-dkms>=$pkgver"
              "virtualbox-libre-guest-dkms>=$pkgver"
              'expac'
-- 
cgit v1.2.3-54-g00ecf


From 02c72cada36587e35d2e16eba0b09bbce34dedd7 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado <emulatorman@lavabit.com>
Date: Tue, 23 Jul 2013 08:00:56 -0300
Subject: linux-libre-lts: updating version

* Update 3.0.87 version for i686 and x86_64
* Update 3.0.86 version for mips64el
---
 libre/linux-libre-lts/PKGBUILD | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD
index 37100b2e5..92400b2ba 100644
--- a/libre/linux-libre-lts/PKGBUILD
+++ b/libre/linux-libre-lts/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 190072 2013-07-14 10:57:39Z tpowa $
+# $Id: PKGBUILD 191275 2013-07-23 04:52:20Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Maintainer: Thomas Baechler <thomas@archlinux.org>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
@@ -8,10 +8,10 @@
 pkgbase=linux-libre-lts     # Build stock -LIBRE-LTS kernel
 #pkgbase=linux-libre-custom # Build kernel with a different name
 _basekernel=3.0
-_sublevel=86
+_sublevel=87
 pkgver=${_basekernel}.${_sublevel}
 pkgrel=1
-_lxopkgver=${_basekernel}.85 # nearly always the same as pkgver
+_lxopkgver=${_basekernel}.86 # nearly always the same as pkgver
 arch=('i686' 'x86_64' 'mips64el')
 url="http://linux-libre.fsfla.org/"
 license=('GPL2')
@@ -33,7 +33,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
         'module-init-wait-3.0.patch'
         "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu1_0loongsonlibre_mipsel.tar.bz2")
 md5sums=('f30a562307b6f71204370fcd33756466'
-         '944af5c4562296147f667d3828b18fa4'
+         '82d8645c9b101791f0cd9b41a6f6b538'
          '7373cc3ac66342156a7fc32af8577b46'
          'b7229f80282337979514f9640a969ff5'
          'c072b17032e80debc6a8626299245d46'
@@ -45,7 +45,7 @@ md5sums=('f30a562307b6f71204370fcd33756466'
          'f36222e7ce20c8e4dc27376f9be60f6c'
          '670931649c60fcb3ef2e0119ed532bd4'
          '8a71abc4224f575008f974a099b5cf6f'
-         'f977e46a6d3788dcba906526d006a2f2')
+         '43654f921934c885642aa7890a223ab0')
 if [ "$CARCH" != "mips64el" ]; then
     # don't use the Loongson-specific patches on non-mips64el arches.
     unset source[${#source[@]}-1]
-- 
cgit v1.2.3-54-g00ecf


From d6da6b21bd3c14d5a3aa9655482770a14c54c6fe Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado <emulatorman@lavabit.com>
Date: Tue, 23 Jul 2013 08:03:10 -0300
Subject: linux-libre-lts-kmod-alx: rebuild against linux-libre-lts-3.0.87-1

---
 libre/linux-libre-lts-kmod-alx/PKGBUILD | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libre/linux-libre-lts-kmod-alx/PKGBUILD b/libre/linux-libre-lts-kmod-alx/PKGBUILD
index 4c9c1c9f8..269fe1327 100644
--- a/libre/linux-libre-lts-kmod-alx/PKGBUILD
+++ b/libre/linux-libre-lts-kmod-alx/PKGBUILD
@@ -1,12 +1,12 @@
 # Maintainer: André Silva <emulatorman@lavabit.com>
 
-_kernver=3.0.86
+_kernver=3.0.87
 _kernrel=1
 pkgname=('linux-libre-lts-kmod-alx')
 _version=v3.9-rc4
 _pkgver=3.9-rc4-2-su
 pkgver=3.9rc4.2
-pkgrel=10
+pkgrel=11
 pkgdesc='Atheros alx ethernet device driver for Linux-libre-lts kernel'
 arch=('i686' 'x86_64')
 url='http://www.linuxfoundation.org/collaborate/workgroups/networking/alx'
-- 
cgit v1.2.3-54-g00ecf


From ea52487369a495150580cb8b3983400f944786d6 Mon Sep 17 00:00:00 2001
From: Alon Ivtsan <alonivtsan@lavabit.com>
Date: Tue, 23 Jul 2013 17:17:04 +0300
Subject: updating youtube-dl-current PKGBUILD

---
 pcr/youtube-dl-current/PKGBUILD | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pcr/youtube-dl-current/PKGBUILD b/pcr/youtube-dl-current/PKGBUILD
index ad242cc05..22e73c4a0 100644
--- a/pcr/youtube-dl-current/PKGBUILD
+++ b/pcr/youtube-dl-current/PKGBUILD
@@ -5,7 +5,7 @@
 pkgname=youtube-dl-current
 _pkgname=youtube-dl
 provides=(youtube-dl)
-pkgver=2013.07.19
+pkgver=2013.07.23
 pkgrel=1
 pkgdesc="A small command-line program to download videos from YouTube.com and a few more sites"
 arch=('any')
@@ -14,7 +14,7 @@ license=('custom')
 depends=('python')
 makedepends=('python-distribute')
 source=(http://youtube-dl.org/downloads/${pkgver}/${_pkgname}-${pkgver}.tar.gz{,.sig})
-md5sums=('e426467eee65cb6224e1ca37433296d1'
+md5sums=('344fb4d8af4412ce4d36bba565da3681'
           'SKIP')
 
 prepare() {
-- 
cgit v1.2.3-54-g00ecf


From 62f5438287ffb7fa4d6c32a8d8366866900385d4 Mon Sep 17 00:00:00 2001
From: Alon Ivtsan <alonivtsan@lavabit.com>
Date: Tue, 23 Jul 2013 21:13:32 +0300
Subject: updating youtube-dl-current PKGBUILD

---
 pcr/youtube-dl-current/PKGBUILD | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pcr/youtube-dl-current/PKGBUILD b/pcr/youtube-dl-current/PKGBUILD
index 22e73c4a0..3f028ddb5 100644
--- a/pcr/youtube-dl-current/PKGBUILD
+++ b/pcr/youtube-dl-current/PKGBUILD
@@ -5,7 +5,7 @@
 pkgname=youtube-dl-current
 _pkgname=youtube-dl
 provides=(youtube-dl)
-pkgver=2013.07.23
+pkgver=2013.07.23.1
 pkgrel=1
 pkgdesc="A small command-line program to download videos from YouTube.com and a few more sites"
 arch=('any')
@@ -14,7 +14,7 @@ license=('custom')
 depends=('python')
 makedepends=('python-distribute')
 source=(http://youtube-dl.org/downloads/${pkgver}/${_pkgname}-${pkgver}.tar.gz{,.sig})
-md5sums=('344fb4d8af4412ce4d36bba565da3681'
+md5sums=('e39cd51317c5b3799828f32268a78974'
           'SKIP')
 
 prepare() {
-- 
cgit v1.2.3-54-g00ecf


From c7863c58cc3f502787eb882bd125173f904e3b29 Mon Sep 17 00:00:00 2001
From: Alon Ivtsan <alonivtsan@lavabit.com>
Date: Thu, 25 Jul 2013 02:14:09 +0300
Subject: updating youtube-dl-current PKGBUILD

---
 pcr/youtube-dl-current/PKGBUILD | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pcr/youtube-dl-current/PKGBUILD b/pcr/youtube-dl-current/PKGBUILD
index 3f028ddb5..84845960e 100644
--- a/pcr/youtube-dl-current/PKGBUILD
+++ b/pcr/youtube-dl-current/PKGBUILD
@@ -5,7 +5,7 @@
 pkgname=youtube-dl-current
 _pkgname=youtube-dl
 provides=(youtube-dl)
-pkgver=2013.07.23.1
+pkgver=2013.07.24.2
 pkgrel=1
 pkgdesc="A small command-line program to download videos from YouTube.com and a few more sites"
 arch=('any')
@@ -14,7 +14,7 @@ license=('custom')
 depends=('python')
 makedepends=('python-distribute')
 source=(http://youtube-dl.org/downloads/${pkgver}/${_pkgname}-${pkgver}.tar.gz{,.sig})
-md5sums=('e39cd51317c5b3799828f32268a78974'
+md5sums=('7ffcae6db1e5387a5f002e195da23cf4'
           'SKIP')
 
 prepare() {
-- 
cgit v1.2.3-54-g00ecf


From 0dae6031d02e422deb3d398cb5cd97f955ac86ff Mon Sep 17 00:00:00 2001
From: Márcio Alexandre Silva Delgado <coadde@lavabit.com>
Date: Thu, 25 Jul 2013 14:05:51 -0300
Subject: luxrender-libre: fixing pkg

---
 libre/luxrender-libre/PKGBUILD | 47 ++++++++++++++++++++++++------------------
 1 file changed, 27 insertions(+), 20 deletions(-)

diff --git a/libre/luxrender-libre/PKGBUILD b/libre/luxrender-libre/PKGBUILD
index 443f45485..0c109a5d1 100644
--- a/libre/luxrender-libre/PKGBUILD
+++ b/libre/luxrender-libre/PKGBUILD
@@ -1,54 +1,61 @@
-# $Id: PKGBUILD 93800 2013-07-10 11:24:05Z stativ $
+# $Id$
 # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com>
 # Contributor: flixie <69one@gmx.net>
 # Contributor: Imanol Celaya <ornitorrincos@archlinux-es.org>
 # Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
-pkgname=luxrender-libre
-_pkgflag=libre
+_pkgname=luxrender
+pkgname=$_pkgname-libre
 pkgver=1.2.1
 _pkgver=3066b2161439
 pkgrel=5
 pkgdesc="Rendering system for physically correct, unbiased image synthesis, without nonfree OpenCL recommendation"
 arch=('i686' 'x86_64' 'mips64el')
-url="http://www.${pkgname%-$_pkgflag}.net/"
+url="http://www.$_pkgname.net/"
 license=('GPL')
-depends=('boost-libs' 'freeimage' 'openexr' 'libcl' 'libgl')
+depends=('boost-libs' 'freeimage' 'openexr' 'libcl-libre' 'mesa-libgl')
 optdepends=('blender-addon-luxrender: Blender for renderer and exporter' 'qt4: Qt GUI' \
             'python: Python interface (pylux)')
-makedepends=('cmake' 'boost' 'mesa' 'qt4' "luxrays=${pkgver::3}" 'python' 'opencl-headers')
-provides=(${pkgname%-$_pkgflag}=$pkgver)
-conflicts=${pkgname%-$_pkgflag}
-replaces=${pkgname%-$_pkgflag}
-source=(https://bitbucket.org/${pkgname%-$_pkgflag}/lux/get/$_pkgver.tar.bz2
+makedepends=('cmake' 'boost' 'mesa' 'qt4' "luxrays=$pkgver" 'python' 'opencl-headers')
+makedepends+=('gcc-lts')
+provides=($_pkgname=$pkgver)
+conflicts=$_pkgname
+replaces=$_pkgname
+source=(https://bitbucket.org/$_pkgname/lux/get/$_pkgver.tar.bz2
         boost-1.53-shared_array_constructor.diff)
 md5sums=(
   '87958798c164ad14f92fb4af2595d332'
   'dd19c7ac2ba8c9b703018a176ef77f98')
 
-build() {
-  cd "$srcdir"/${pkgname%-$_pkgflag}-lux-$_pkgver
+prepare() {
+  cd "$srcdir"/$_pkgname-lux-$_pkgver
 
   # fix the installation
-  sed -i '/.*wxgui.*/ d' CMakeLists.txt
+  sed -i '/.*wxgui.*/ d
+          s|-ftree-vectorize ||
+         ' CMakeLists.txt
   # fix for boost 1.53
   patch -Np1 < "$srcdir/boost-1.53-shared_array_constructor.diff" || true
 
   export CXXFLAGS="$CXXFLAGS -lpthread"
-  setarch $CARCH cmake -DCMAKE_INSTALL_PREFIX=/usr \
+}
+
+build() {
+  cd "$srcdir"/$_pkgname-lux-$_pkgver
+
+  cmake . -DCMAKE_INSTALL_PREFIX=/usr \
     -DLUXRAYS_DISABLE_OPENCL=OFF \
     -DPYTHON_CUSTOM=ON \
     -DPYTHON_LIBRARIES=/usr/lib/libpython3.3m.so \
-    -DPYTHON_INCLUDE_PATH=/usr/include/python3.3m/ \
-    .
-  setarch $CARCH make
+    -DPYTHON_INCLUDE_PATH=/usr/include/python3.3m
+  make
 }
 
 package() {
-  cd "$srcdir"/${pkgname%-$_pkgflag}-lux-$_pkgver
+  cd "$srcdir"/$_pkgname-lux-$_pkgver
   setarch $CARCH make DESTDIR="$pkgdir" install
 
-  # fix library path on x86_64
-  [ "$CARCH" = "x86_64" ] && mv "$pkgdir"/usr/lib64 "$pkgdir"/usr/lib
+  # fix library path on 64bit
+  [[ $CARCH == x86_64 ]] && mv "$pkgdir"/usr/lib64 "$pkgdir"/usr/lib
 
   #install pylux
   install -D -m644 pylux.so "$pkgdir"/usr/lib/python3.3/pylux.so
-- 
cgit v1.2.3-54-g00ecf


From 1e4ccd765bfece9f1a74ab4957d667e81954e55f Mon Sep 17 00:00:00 2001
From: Márcio Alexandre Silva Delgado <coadde@lavabit.com>
Date: Thu, 25 Jul 2013 14:07:47 -0300
Subject: gcc-lts: fixing pkg

---
 pcr/gcc-lts/PKGBUILD | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/pcr/gcc-lts/PKGBUILD b/pcr/gcc-lts/PKGBUILD
index c3ab693d3..b1280fad9 100644
--- a/pcr/gcc-lts/PKGBUILD
+++ b/pcr/gcc-lts/PKGBUILD
@@ -8,7 +8,7 @@
 #pkgname=('gcc-lts' 'gcc-lts-libs' 'gcc-lts-fortran' 'gcc-lts-objc' 'gcc-lts-ada' 'gcc-lts-go')
 pkgname=('gcc-lts' 'gcc-lts-libs' 'gcc-lts-fortran' 'gcc-lts-objc' 'gcc-lts-go')
 pkgver=4.7.3
-pkgrel=1
+pkgrel=3
 pkgdesc="The GNU Compiler Collection"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL' 'custom')
@@ -96,9 +96,9 @@ check() {
 package_gcc-lts-libs()
 {
   pkgdesc="Runtime libraries shipped by GCC"
-  groups=('base')
+  groups=('lts')
   depends=('glibc>=2.17')
-  provides=('gcc-libs')
+  provides=("gcc-libs=$pkgver")
   conflicts=('gcc-libs')
   install=gcc-libs.install
 
@@ -134,10 +134,10 @@ package_gcc-lts-libs()
 package_gcc-lts()
 {
   pkgdesc="The GNU Compiler Collection - C and C++ frontends"
-  depends=("gcc-libs=$pkgver-$pkgrel" 'binutils>=2.23' 'libmpc' 'cloog' 'ppl')
-  provides=('gcc')
+  depends=("gcc-lts-libs=$pkgver" 'binutils>=2.23' 'libmpc' 'cloog' 'ppl')
+  provides=("gcc=$pkgver")
   conflicts=('gcc')
-  groups=('base-devel')
+  groups=('lts-devel')
   install=gcc.install
 
   cd ${srcdir}/gcc-build
@@ -212,8 +212,8 @@ EOF
 package_gcc-lts-fortran()
 {
   pkgdesc="Fortran front-end for GCC"
-  depends=("gcc=$pkgver-$pkgrel")
-  provides=('gcc-fortran')
+  depends=("gcc-lts=$pkgver")
+  provides=("gcc-fortran=$pkgver")
   conflicts=('gcc-fortran')
   install=gcc-fortran.install
 
@@ -241,8 +241,8 @@ package_gcc-lts-fortran()
 package_gcc-lts-objc()
 {
   pkgdesc="Objective-C front-end for GCC"
-  depends=("gcc=$pkgver-$pkgrel")
-  provides=('gcc-objc')
+  depends=("gcc-lts=$pkgver")
+  provides=("gcc-objc=$pkgver")
   conflicts=('gcc-objc')
 
   cd ${srcdir}/gcc-build
@@ -264,8 +264,8 @@ package_gcc-lts-objc()
 package_gcc-lts-ada()
 {
   pkgdesc="Ada front-end for GCC (GNAT)"
-  depends=("gcc=$pkgver-$pkgrel")
-  provides=('gcc-ada')
+  depends=("gcc-lts=$pkgver")
+  provides=("gcc-ada=$pkgver")
   conflicts=('gcc-ada')
   install=gcc-ada.install
 
@@ -283,8 +283,8 @@ package_gcc-lts-ada()
 package_gcc-lts-go()
 {
   pkgdesc="Go front-end for GCC"
-  depends=("gcc=$pkgver-$pkgrel")
-  provides=('gcc-go')
+  depends=("gcc-lts=$pkgver")
+  provides=("gcc-go=$pkgver")
   conflicts=('gcc-go')
   install=gcc-go.install
 
-- 
cgit v1.2.3-54-g00ecf


From 59400030400c414b21755bbacbec4ccfb86ea5ba Mon Sep 17 00:00:00 2001
From: Alon Ivtsan <alonivtsan@lavabit.com>
Date: Thu, 25 Jul 2013 21:42:29 +0300
Subject: updating youtube-dl-current PKGBUILD

---
 pcr/youtube-dl-current/PKGBUILD | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pcr/youtube-dl-current/PKGBUILD b/pcr/youtube-dl-current/PKGBUILD
index 84845960e..760daf05f 100644
--- a/pcr/youtube-dl-current/PKGBUILD
+++ b/pcr/youtube-dl-current/PKGBUILD
@@ -5,7 +5,7 @@
 pkgname=youtube-dl-current
 _pkgname=youtube-dl
 provides=(youtube-dl)
-pkgver=2013.07.24.2
+pkgver=2013.07.25.1
 pkgrel=1
 pkgdesc="A small command-line program to download videos from YouTube.com and a few more sites"
 arch=('any')
@@ -14,7 +14,7 @@ license=('custom')
 depends=('python')
 makedepends=('python-distribute')
 source=(http://youtube-dl.org/downloads/${pkgver}/${_pkgname}-${pkgver}.tar.gz{,.sig})
-md5sums=('7ffcae6db1e5387a5f002e195da23cf4'
+md5sums=('860d4bc099104508db2ae6b0ed0e5b71'
           'SKIP')
 
 prepare() {
-- 
cgit v1.2.3-54-g00ecf


From ac7074bacde3a27f3d5169b235e336420b39b349 Mon Sep 17 00:00:00 2001
From: Márcio Alexandre Silva Delgado <coadde@lavabit.com>
Date: Thu, 25 Jul 2013 15:50:14 -0300
Subject: zoneminder: fixing pkg

---
 pcr/zoneminder/PKGBUILD               | 209 +++++++++++++++++++++-------------
 pcr/zoneminder/sysctl-zoneminder.conf |   3 +
 pcr/zoneminder/zoneminder.install     |  69 ++++++-----
 3 files changed, 174 insertions(+), 107 deletions(-)
 create mode 100644 pcr/zoneminder/sysctl-zoneminder.conf

diff --git a/pcr/zoneminder/PKGBUILD b/pcr/zoneminder/PKGBUILD
index bf03b4133..ede03dd77 100644
--- a/pcr/zoneminder/PKGBUILD
+++ b/pcr/zoneminder/PKGBUILD
@@ -7,27 +7,24 @@
 
 # based of debian squeeze package
 
-pkgbase=zoneminder
+_automake=1.14
+
 pkgname=zoneminder
 pkgver=1.25.0
-pkgrel=27
+pkgrel=28
 pkgdesc='Capture, analyse, record and monitor video security cameras'
 arch=(
-  i686
-  x86_64
   mips64el
-  arm
-)
-backup=(
-  etc/zm.conf
-)
-url="http://www.$pkgbase.com"
-license=(
-  GPL
+  x86_64
+  i686
 )
+backup=etc/zm.conf
+url=http://www.$pkgname.com
+license=GPL2
 depends=(
   apache
   cambozola
+  ffmpeg
   gnutls
   mariadb
   perl-archive-zip
@@ -48,108 +45,158 @@ depends=(
   php-gd
   php-mcrypt
 )
-makedepends=(
-  netpbm
-)
-optdepends=(
-  netpbm
-)
-install=$pkgbase.install
+makedepends=netpbm
+optdepends=netpbm
+options=(!libtool)
+install=$pkgname.install
 source=(
-  http://www.$pkgbase.com/downloads/ZoneMinder-$pkgver.tar.gz
-  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
+  http://www.$pkgname.com/downloads/ZoneMinder-$pkgver.tar.gz
+  httpd-$pkgname.conf
+  $pkgname.service
+  sysctl-$pkgname.conf
+  $pkgname-$pkgver-ffmpeg.patch
+  $pkgname-$pkgver-gcrypt.patch
 )
 sha512sums=(
   3e18993b0539729491052c97d8c94227ccc089eb40277c2f07682f30049033303c7cfe9734fdac6d33ae67df29c76eb72bf7fbb5dae8227e8831fa603b61c375
   4ce0d8eba9d006d258f5b8a83920fc17f1f602b96518d37b7a47cd9b6eb84ef2587641a6ba839a469c3f0e33b46475866187279ae3f8be0d4054b074ee5d6b08
-  ab4e1d5ddaf4d9cd53d6ca59d7965902afd6a2dc830fbbafa270736c52c2b3563075fee860bb0276466f96e9dbfb71b259ac45a4ae2e4ead8eaec154a0159eb0
   cfb0eb87a989236c72741a496ddc6a73aa2696e5beaaca4836d3c231ddb24c7ef5e9f65e7afa49674f2115cbfa4a07c75486e1947ce294c816ddbb875f3b99cf
-  4fa79e49a3c04e9fdc9823792c6a28012002479c77ed41637bd2d21f089e4c15592bfcd5c24028f356c9f80d774a5080a6841e8e70a435d607e3089d0b121775
-  3da7d4d21dea166ea12b49e88a05a9f7a75790881a1f2d7588fa9e0e6ce592b4b5ee71994fa8b05236efeeb57890157a622c752c12a9059c2ee915adf3b4660d
+  7330c179f1e2db815a675560d3d84648be02f7d0292f8cbe21d6033577fe688ed71ad23b5b8c9dc309395b45ebb554f9499e7a4b57091959b69679011fa59044
   7fc2a4663c3103bef641be065bd7992a2b3dc0699f1b99dc2fdb34c1c48e58686e490d3ade523ef7c8e29b3f04109658eef652c26ff6ee3fb9aee65453bdb6c4
-  17b85051543c34a41c6b94ec8f46a10927aa4bc9554562650788c8257ffba8e362500cf3641708f2f9dabebc663a2d012fa9feacd7f9b33c637fbc965d405adf
-  8eab0a922968465fee8537dc035ce781e51dc84cc05259a32acb5bf59c618bc1700dbf4eec90717ed5959841def119357974d109df8d7450c12ca4ea8576e55c
   8c9e7debcaf60be1c2dda656f95e497f6812d704edc3ca4a1c915a3b3c9dc1749c91d96bc2d60db7d90d5edfd9e2dfc39010dfe4feabfecfffd27f1fffc3d675
 )
 
+prepare() {
+  cd $srcdir/ZoneMinder-$pkgver
+
+  # Patch for automake
+  sed -i "\|^am__api_version=| s|1[.]11|$_automake|;
+         " configure
+
+  # Patch for GCC
+  sed -i 's|^#include [<]errno[.]h[>]$|#include <errno.h>\n#include <unistd.h>|;
+         ' src/zm_logger.cpp
+  sed -i 's|^#include [<]pthread[.]h[>]$|#include <pthread.h>\n#include <unistd.h>|;
+         ' src/zm_thread.h
+  sed -i 's|^#include [<]fcntl[.]h[>]$|#include <fcntl.h>\n#include <limits.h>|;
+         ' src/zm_local_camera.cpp
+
+  # Patch for type cast in linux-libre kernel 3.5 and for wrong type "suppported"
+  sed -i 's|enum v4l2_buf_type type = v4l2_data[.]fmt[.]type|enum v4l2_buf_type type = (v4l2_buf_type)v4l2_data.fmt.type|; 
+          s|suppported|supported|;
+         ' src/zm_local_camera.cpp
+
+  # configure crash on i686
+  [[ $CARCH != i686 ]] && {
+    # Patch for fixing warning
+    sed -i 's|pdest[+][+] = ([*]blend_ptr)\[[*]pdest]\[[*]psrc[+][+]]|pdest = (*blend_ptr)[*pdest][*psrc++];\n			pdest++|;
+           ' src/zm_image.cpp
+  }
+
+  # Patch for support ffmpeg with <libavutil/mathematics.h>
+  #sed -i '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
+
+  # Patch for support C library
+  #sed -i '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 for disable ZM_CHECK_FOR_UPDATES
+  sed -i '\|ZM_CHECK_FOR_UPDATES|,+1 s|yes|no|;
+         ' scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
+
+  # Patch for support html5 video and flv
+  sed -i '\|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
+
+  # Patch for change path run dir and for change ZM name to ZoneMinder
+  sed -i '\|ZM_PATH_SOCKS|,+1 s|TMP|RUN|;
+          \|ZM_WEB_TITLE_PREFIX|,+1 s|"ZM"|"ZoneMinder"|;
+         ' scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
+
+  # Patch for v4l2 convert support
+  sed -i '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
+
+  # Patch for add more socket tries
+  sed -i '\|^$max_socket_tries = | s|3|15|;
+         ' web/ajax/stream.php
+
+  # Patch for text
+  sed -i 's|if ( fwrite( buffer, n_bytes, 1, stdout ) )|if ( fwrite( buffer, n_bytes, 1, stdout ) != 1 )|;
+         ' src/zm_stream.cpp
+
+  # Patch for remove HACK in Makefile.*
+  sed -i '\|This is a HACK|d;
+          \|^install-data-hook:$|,+5 d;
+          s| install-data-hook||;
+          \|^uninstall-hook:$|,+5 d;
+          s| uninstall-hook||;
+         ' Makefile.{am,in}
+
+  # Patch
+  for _patch in ffmpeg gcrypt; do
+    patch -Np1 -F99 -i $srcdir/$pkgname-$pkgver-$_patch.patch
+  done
+}
+
 build() {
   cd $srcdir/ZoneMinder-$pkgver
-  # 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
-  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 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 -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
-
-export CXXFLAGS=-D__STDC_CONSTANT_MACROS
-./configure --prefix=/usr\
+
+  # ZM_RUNDIR need change to run dir
+  export CPPFLAGS="$CPPFLAGS -D__STDC_CONSTANT_MACROS"\
+    OPT_FFMPEG=yes\
+    PATH_FFMPEG=/usr/bin/ffmpeg\
+    ZM_LOGDIR=/var/log/$pkgname\
+    ZM_RUNDIR=/tmp/$pkgname\
+    ZM_SSL_LIB=libgcrypt\
+    ZM_TMPDIR=/tmp/$pkgname
+
+  ./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=/usr\
     --with-libarch=lib\
-    --with-ffmpeg=/usr \
     --with-mysql=/usr\
-    --with-webdir=/srv/http/$pkgbase\
+    --with-webdir=/srv/http/$pkgname\
     --with-webgroup=http\
     --with-webhost=localhost\
-    --with-webuser=http \
-
+    --with-webuser=http
   make V=0
 }
 
 package() {
   cd $srcdir/ZoneMinder-$pkgver
-
   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
+  mkdir -vp $pkgdir/{etc/{httpd/conf/extra,sysctl.d},srv/http/{cgi-bin,$pkgname/socks},usr/{lib/systemd/system,share/{licenses/$pkgname,$pkgname/db}},var/{cache/$pkgname,log/$pkgname}}
+  chown -vR http.http $pkgdir/{etc/zm.conf,srv/http/$pkgname/socks,var/{cache/$pkgname,log/$pkgname}}
+  chmod -v 0700 $pkgdir/etc/zm.conf
 
   for i in events images temp; do
-    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
+    mv -v  $pkgdir/srv/http/$pkgname/$i $pkgdir/var/cache/$pkgname/$i
+    ln -vs /var/cache/$pkgname/$i       $pkgdir/srv/http/$pkgname/$i
+    chown -vh http.http                 $pkgdir/srv/http/$pkgname/$i
   done
 
-  ln -s /srv/http/cgi-bin                  $pkgdir/srv/http/$pkgbase
-  chown -h http.http                       $pkgdir/srv/http/{cgi-bin,$pkgbase,$pkgbase/cgi-bin}
+  ln -vs /srv/http/cgi-bin                  $pkgdir/srv/http/$pkgname
+  chown -vh http.http                       $pkgdir/srv/http/{cgi-bin,$pkgname,$pkgname/cgi-bin}
 
-  ln -s /usr/share/cambozola/cambozola.jar $pkgdir/srv/http/$pkgbase
+  ln -vs /usr/share/cambozola/cambozola.jar $pkgdir/srv/http/$pkgname
 
-  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
+  install -vDm644 $srcdir/httpd-$pkgname.conf  $pkgdir/etc/httpd/conf/extra
+  install -vDm644 $srcdir/$pkgname.service     $pkgdir/usr/lib/systemd/system
+  install -vDm644 $srcdir/sysctl-$pkgname.conf $pkgdir/etc/sysctl.d
+  install -vDm644 $srcdir/sysctl-$pkgname.conf $pkgdir/srv/http/$pkgname
+  install -vDm644 COPYING                      $pkgdir/usr/share/licenses/$pkgname
+  install -vDm644 db/zm*.sql                   $pkgdir/usr/share/$pkgname/db
 }
diff --git a/pcr/zoneminder/sysctl-zoneminder.conf b/pcr/zoneminder/sysctl-zoneminder.conf
new file mode 100644
index 000000000..ec1407dee
--- /dev/null
+++ b/pcr/zoneminder/sysctl-zoneminder.conf
@@ -0,0 +1,3 @@
+# For Zoneminder Monitor
+#kernel.shmall = 524288000
+#kernel.shmmax = 524288000
diff --git a/pcr/zoneminder/zoneminder.install b/pcr/zoneminder/zoneminder.install
index 899e2a5d1..66109d5fa 100644
--- a/pcr/zoneminder/zoneminder.install
+++ b/pcr/zoneminder/zoneminder.install
@@ -1,3 +1,4 @@
+#!/usr/bin/bash
 pre_install() {
   set -e
   abort=false
@@ -27,20 +28,20 @@ EOF
 
 post_install() {
   if [[ -d /var/log/zoneminder ]]; then
-    chmod 0755 /var/log/zoneminder
-    chown http.http /var/log/zoneminder
+    chmod -v 0755      /var/log/zoneminder
+    chown -v http.http /var/log/zoneminder
   else
-    mkdir -m 0755 /var/log/zoneminder
-    chown http.http /var/log/zoneminder
+    mkdir -vm 0755      /var/log/zoneminder
+    chown -v  http.http /var/log/zoneminder
   fi
   if [[ -d /tmp/zoneminder ]]; then
-    chmod 0700 /tmp/zoneminder
-    chown http.http /tmp/zoneminder
+    chmod -v 0700      /tmp/zoneminder
+    chown -v http.http /tmp/zoneminder
   else
-    mkdir -m 0700 /tmp/zoneminder
-    chown http.http /tmp/zoneminder
+    mkdir -vm 0700      /tmp/zoneminder
+    chown -v  http.http /tmp/zoneminder
   fi
-  sed -i -e '
+  sed -i '
     /^;extension=mysql.so/ s/^;//;
     /^#extension=mysql.so/ s/^#//;
     /^;extension=mysqli.so/ s/^;//;
@@ -69,8 +70,11 @@ post_install() {
     /^open_basedir/ s/:\/srv\/http\/zoneminder//;
     /^open_basedir/ s/:\/srv\/http\/zoneminder\///;
     /^open_basedir/ s/$/:\/srv\/http\/zoneminder/;
-    ' /etc/php/php.ini || read
-  sed -i -e '
+    /^open_basedir/ s/:\/var\/cache\/zoneminder//;
+    /^open_basedir/ s/:\/var\/cache\/zoneminder\///;
+    /^open_basedir/ s/$/:\/var\/cache\/zoneminder/;
+    ' /etc/php/php.ini
+  sed -i '
     /^LoadModule php5_module modules\/libphp5.so/d;
     /^LoadModule rewrite_module modules\/mod_rewrite.so/ s/$/\nLoadModule php5_module modules\/libphp5.so/;
     /^# PHP 5/d;
@@ -78,11 +82,12 @@ post_install() {
     /^Include \/etc\/httpd\/conf\/extra\/php5_module.conf/d;
     /^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
+    ' /etc/httpd/conf/httpd.conf
+  gpasswd -a http video
   cat << EOF
 Note for mysql:
 ==> To run Zoneminder, you must install the database running mysql service (as root):
-==> "rc.d start mysqld" (in initscripts) or "systemctl start mysqld.service" (in systemd)
+==> "systemctl start mysqld.service"
 ==> and add Zoneminder database typing (with passsword):
 ==> "mysqladmin --defaults-file=/etc/mysql/my.cnf -p -f reload"
 ==> "cat /usr/share/zoneminder/db/zm_create.sql | mysql --defaults-file=/etc/mysql/my.cnf -p"
@@ -92,6 +97,11 @@ Note for mysql:
 ==> "cat /usr/share/zoneminder/db/zm_create.sql | mysql --defaults-file=/etc/mysql/my.cnf"
 ==> "echo 'grant lock tables, alter,select,insert,update,delete on zm.* to 'zmuser'@localhost identified by "zmpass";' | mysql --defaults-file=/etc/mysql/my.cnf mysql"
 
+Note for sysctl:
+==> You must uncomment that line in /etc/sysctl.d/sysctl-zoneminder.conf:
+==> "kernel.shmall = 524288000"
+==> "kernel.shmmax = 524288000"
+
 Note for php:
 ==> You must uncomment that line in /etc/php/php.ini:
 ==> "extension=mysql.so"
@@ -105,11 +115,11 @@ Note for php:
 ==> "extension=openssl.so"
 ==> "extension=ftp.so"
 ==> "extension=zip.so"
-==> check and add to open_basedir "/etc" and
-==> "/srv/http/zoneminder" like so
-==> "open_basedir = /home:/tmp:/usr/share/pear:/etc:/srv/http/zoneminder"
+==> 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"
 ==> and set your timezone in php.ini:
-==> "date.timezone = <your_country>/<your_city>"
+==> "date.timezone = <your_zone>/<your_city>"
 
 Note for apache:
 ==> You must edit /etc/httpd/conf/httpd.conf and add the line:
@@ -122,21 +132,25 @@ EOF
 
 post_upgrade() {
   post_install
+  _mysqld=$(systemctl status mysqld.service | grep -o 'inactive (dead)')
+  [[ _mysqld == 'inactive (dead)' ]] && systemctl start mysqld.service
   /usr/bin/zmupdate.pl -f >/dev/null
+  [[ _mysqld == 'inactive (dead)' ]] && systemctl stop mysqld.service
 }
 
 post_remove() {
-  if [[ -d /tmp/zoneminder ]]; then
-    rm -vr /tmp/zoneminder
-  fi
-  sed -i -e '
+  _zms=$(systemctl status zoneminder.service | grep -o 'active (running)')
+  [[ _zms == 'active (running)' ]] && systemctl stop zoneminder.service
+  [[ -d /tmp/zoneminder ]] && rm -vr /tmp/zoneminder
+  sed -i '
     /^open_basedir/ s/:\/srv\/http\/zoneminder//;
     /^open_basedir/ s/:\/srv\/http\/zoneminder\///;
-    ' /etc/php/php.ini || read
-  sed -i -e '
+    /^open_basedir/ s/:\/var\/cache\/zoneminder\///
+    ' /etc/php/php.ini
+  sed -i '
     /^# ZoneMinder/d;
     /Include \/etc\/httpd\/conf\/extra\/httpd-zoneminder.conf/d;
-    ' /etc/httpd/conf/httpd.conf || read
+    ' /etc/httpd/conf/httpd.conf
   cat << EOF
 Note:
 ==> To clean Zoneminder mysql database, run as root (with password):
@@ -165,9 +179,12 @@ Note:
 ==> "extension=mysqli.so"
 ==> "extension=session.so"
 ==> "extension=sockets.so"
-==> "date.timezone = <my_country>/<my_city>"
+==> "date.timezone = <my_zone>/<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" and "/srv/http/zoneminder"
+==> Edit /etc/php/php.ini and remove "/etc", "/srv/http/zoneminder" and "/var/cache/zoneminder"
 ==> in the "open_basedir".
 
 ==> Remove log files and "zonemider" directory in "/var/log/zoneminder".
-- 
cgit v1.2.3-54-g00ecf


From 3cba2056614d19fe4915f5e0009d5f8683ff7a9d Mon Sep 17 00:00:00 2001
From: Alon Ivtsan <alonivtsan@lavabit.com>
Date: Fri, 26 Jul 2013 04:52:51 +0300
Subject: updating youtube-dl-current PKGBUILD

---
 pcr/youtube-dl-current/PKGBUILD | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pcr/youtube-dl-current/PKGBUILD b/pcr/youtube-dl-current/PKGBUILD
index 760daf05f..a2d174304 100644
--- a/pcr/youtube-dl-current/PKGBUILD
+++ b/pcr/youtube-dl-current/PKGBUILD
@@ -5,7 +5,7 @@
 pkgname=youtube-dl-current
 _pkgname=youtube-dl
 provides=(youtube-dl)
-pkgver=2013.07.25.1
+pkgver=2013.07.25.2
 pkgrel=1
 pkgdesc="A small command-line program to download videos from YouTube.com and a few more sites"
 arch=('any')
@@ -14,7 +14,7 @@ license=('custom')
 depends=('python')
 makedepends=('python-distribute')
 source=(http://youtube-dl.org/downloads/${pkgver}/${_pkgname}-${pkgver}.tar.gz{,.sig})
-md5sums=('860d4bc099104508db2ae6b0ed0e5b71'
+md5sums=('db09e5672c674ccadd3c9afed77189d9'
           'SKIP')
 
 prepare() {
-- 
cgit v1.2.3-54-g00ecf


From 08e5245a00de624be126945a92ee01140d368cdd Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado <emulatorman@lavabit.com>
Date: Fri, 26 Jul 2013 04:25:10 -0300
Subject: linux-libre-3.10.2-1: updating version for mips64el

---
 libre/linux-libre/PKGBUILD | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD
index 37ec6585b..90b6a45c5 100644
--- a/libre/linux-libre/PKGBUILD
+++ b/libre/linux-libre/PKGBUILD
@@ -13,7 +13,7 @@ _basekernel=3.10
 _sublevel=2
 pkgver=${_basekernel}.${_sublevel}
 pkgrel=1
-_lxopkgver=${_basekernel}.1 # nearly always the same as pkgver
+_lxopkgver=${_basekernel}.2 # nearly always the same as pkgver
 arch=('i686' 'x86_64' 'mips64el')
 url="http://linux-libre.fsfla.org/"
 license=('GPL2')
@@ -39,7 +39,7 @@ md5sums=('d562fd52580a3b6b18b6eeb5921d1d5c'
          '8267264d9a8966e57fdacd1fa1fc65c4'
          '04b21c79df0a952c22d681dd4f4562df'
          'f3def2cefdcbb954c21d8505d23cc83c'
-         '223606d6db3504732aab7711833a30fb')
+         'dd620e4cb68341f847686c000d8038e8')
 if [ "$CARCH" != "mips64el" ]; then
     # don't use the Loongson-specific patches on non-mips64el arches.
     unset source[${#source[@]}-1]
-- 
cgit v1.2.3-54-g00ecf


From ce526ca35d39fac940eebb19505ed82ec1a67358 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado <emulatorman@lavabit.com>
Date: Fri, 26 Jul 2013 15:46:25 -0300
Subject: linux-libre-3.10.3-1: updating version for i686 and x86_64

---
 libre/linux-libre/PKGBUILD | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD
index 90b6a45c5..64ac53efa 100644
--- a/libre/linux-libre/PKGBUILD
+++ b/libre/linux-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 191254 2013-07-22 12:16:46Z tpowa $
+# $Id: PKGBUILD 191595 2013-07-26 15:20:34Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Maintainer: Thomas Baechler <thomas@archlinux.org>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
@@ -10,7 +10,7 @@
 pkgbase=linux-libre         # Build stock -LIBRE kernel
 #pkgbase=linux-libre-custom # Build kernel with a different name
 _basekernel=3.10
-_sublevel=2
+_sublevel=3
 pkgver=${_basekernel}.${_sublevel}
 pkgrel=1
 _lxopkgver=${_basekernel}.2 # nearly always the same as pkgver
@@ -31,7 +31,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
         'change-default-console-loglevel.patch'
         "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2")
 md5sums=('d562fd52580a3b6b18b6eeb5921d1d5c'
-         '3d06da86aca3af3babcb23b98eeb5442'
+         '4741e325185acae5498cfc77a5e8f55b'
          '542fc77350e62009bca7af080359b286'
          'bd77b7112db61fb184139daaa1e390ac'
          'e49ac236dfeef709f91a3d993ea7b62c'
-- 
cgit v1.2.3-54-g00ecf


From 6e1c71178a099c9e0bebf7d7ef47c3dda6675242 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado <emulatorman@lavabit.com>
Date: Fri, 26 Jul 2013 16:06:50 -0300
Subject: linux-libre-{pae,xen}-3.10.3-1: updating version

---
 kernels/linux-libre-pae/PKGBUILD | 6 +++---
 kernels/linux-libre-xen/PKGBUILD | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/kernels/linux-libre-pae/PKGBUILD b/kernels/linux-libre-pae/PKGBUILD
index 55204ff79..badb6d2c6 100644
--- a/kernels/linux-libre-pae/PKGBUILD
+++ b/kernels/linux-libre-pae/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 191254 2013-07-22 12:16:46Z tpowa $
+# $Id: PKGBUILD 191595 2013-07-26 15:20:34Z tpowa $
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: Thomas Baechler <thomas@archlinux.org>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
@@ -6,7 +6,7 @@
 pkgbase=linux-libre-pae     # Build stock -LIBRE-PAE kernel
 #pkgbase=linux-libre-custom # Build kernel with a different name
 _basekernel=3.10
-pkgver=${_basekernel}.2
+pkgver=${_basekernel}.3
 pkgrel=1
 arch=('i686')
 url="http://linux-libre.fsfla.org/"
@@ -22,7 +22,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
         'boot-logo.patch'
         'change-default-console-loglevel.patch')
 md5sums=('d562fd52580a3b6b18b6eeb5921d1d5c'
-         '3d06da86aca3af3babcb23b98eeb5442'
+         '4741e325185acae5498cfc77a5e8f55b'
          'ead29a0206b79cc56ab97930e5d517ae'
          'f302c931bd85309da9d9792b4cc96467'
          '04b21c79df0a952c22d681dd4f4562df'
diff --git a/kernels/linux-libre-xen/PKGBUILD b/kernels/linux-libre-xen/PKGBUILD
index e78f09ee9..5583ffba0 100644
--- a/kernels/linux-libre-xen/PKGBUILD
+++ b/kernels/linux-libre-xen/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 191254 2013-07-22 12:16:46Z tpowa $
+# $Id: PKGBUILD 191595 2013-07-26 15:20:34Z tpowa $
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: Thomas Baechler <thomas@archlinux.org>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
@@ -6,7 +6,7 @@
 pkgbase=linux-libre-xen     # Build stock -LIBRE-XEN kernel
 #pkgbase=linux-libre-custom # Build kernel with a different name
 _basekernel=3.10
-pkgver=${_basekernel}.2
+pkgver=${_basekernel}.3
 pkgrel=1
 arch=('i686')
 url="http://linux-libre.fsfla.org/"
@@ -22,7 +22,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
         'boot-logo.patch'
         'change-default-console-loglevel.patch')
 md5sums=('d562fd52580a3b6b18b6eeb5921d1d5c'
-         '3d06da86aca3af3babcb23b98eeb5442'
+         '4741e325185acae5498cfc77a5e8f55b'
          'e2cb9d4092685c2a4216de9bbe8b72f1'
          'b7c2805bb287a644c0a303bf7721e534'
          '04b21c79df0a952c22d681dd4f4562df'
-- 
cgit v1.2.3-54-g00ecf


From d33eabdee3fa6b57883cefe3d72f4e97e6d8a9bf Mon Sep 17 00:00:00 2001
From: Márcio Alexandre Silva Delgado <coadde@lavabit.com>
Date: Fri, 26 Jul 2013 17:08:22 -0300
Subject: python-pygame-hg: adding package to pcr repo

---
 pcr/python-pygame-hg/PKGBUILD | 72 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 72 insertions(+)
 create mode 100644 pcr/python-pygame-hg/PKGBUILD

diff --git a/pcr/python-pygame-hg/PKGBUILD b/pcr/python-pygame-hg/PKGBUILD
new file mode 100644
index 000000000..c48317b19
--- /dev/null
+++ b/pcr/python-pygame-hg/PKGBUILD
@@ -0,0 +1,72 @@
+# Maintainer: Márcio Silva <coadde@lavabit.com>
+
+_pkgname=pygame
+_pkgver=1.9.2
+_pyname=python
+_py3ver=3.3
+_py2ver=2.7
+_pkg3name=$_pyname-$_pkgname
+_pkg2name=${_pyname}2-$_pkgname
+_srcver=pre.d$(LC_ALL=C date -u +%Y%m%d)
+
+pkgbase=$_pyname-$_pkgname
+pkgname=(
+  $_pkg3name-hg
+  $_pkg2name-hg
+)
+pkgver=$_pkgver$_srcver
+pkgrel=1
+pkgdesc="${_pyname^} game library"
+arch=(
+  mips64el
+  x86_64
+  i686
+)
+url=http://www.$_pkgname.org/
+license=LGPL2.1
+depends=(
+  ffmpeg
+  portmidi
+  python
+  python2
+  #sdl_gfx
+  sdl_image
+  sdl_mixer
+  sdl_ttf
+)
+makedepends=mercurial
+source=hg+https://bitbucket.org/$_pkgname/$_pkgname
+sha512sums=SKIP
+
+package_python-pygame-hg() {
+  # disabled, due which conflicts with $_pkg2name
+  #provides=("$_pkg3name=$_pkgver")
+  #conflicts=$_pkg3name
+
+  cd $_pkgname
+
+  msg Building
+  find . -type f -exec sed -i "s|/usr/bin/env ${_pyname}2|/usr/bin/env $_pyname|" {} +
+  $_pyname config.py -auto
+  $_pyname setup.py install --root=$pkgdir --prefix=/usr
+
+  msg 'Copying the examples and tests'
+  cp -va examples lib/* $pkgdir/usr/lib/$_pyname$_py3ver/site-packages/$_pkgname
+  cp -va test/* $pkgdir/usr/lib/$_pyname$_py3ver/site-packages/$_pkgname/tests
+}
+
+package_python2-pygame-hg() {
+  provides=("$_pkg2name=$_pkgver")
+  conflicts=$_pkg2name
+
+  cd $_pkgname
+
+  msg Building
+  find . -type f -exec sed -i "s|/usr/bin/env $_pyname|/usr/bin/env ${_pyname}2|" {} +
+  ${_pyname}2 config.py -auto
+  ${_pyname}2 setup.py install --root=$pkgdir --prefix=/usr
+
+  msg 'Copying the examples and tests'
+  cp -va examples lib/* $pkgdir/usr/lib/$_pyname$_py2ver/site-packages/$_pkgname
+  cp -va test/* $pkgdir/usr/lib/$_pyname$_py2ver/site-packages/$_pkgname/tests
+}
-- 
cgit v1.2.3-54-g00ecf


From 9cb8b4d961764ab44ed2fd1f15350725e689b639 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado <emulatorman@lavabit.com>
Date: Fri, 26 Jul 2013 20:19:14 -0300
Subject: ice{cat,weasel}-adblock-plus-2.3.1-1: updating version

---
 libre/icecat-adblock-plus/PKGBUILD    | 6 +++---
 libre/iceweasel-adblock-plus/PKGBUILD | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/libre/icecat-adblock-plus/PKGBUILD b/libre/icecat-adblock-plus/PKGBUILD
index 9508d8e15..3c078997c 100644
--- a/libre/icecat-adblock-plus/PKGBUILD
+++ b/libre/icecat-adblock-plus/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 90899 2013-05-15 12:56:13Z spupykin $
+# $Id: PKGBUILD 94536 2013-07-26 13:15:58Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 
 _pkgname=firefox-adblock-plus
 pkgname=icecat-adblock-plus
-pkgver=2.2.4
+pkgver=2.3.1
 _addons_file=206960
-pkgrel=2
+pkgrel=1
 pkgdesc="plugin for icecat which block ads and banners"
 arch=('any')
 url="http://adblockplus.org/"
diff --git a/libre/iceweasel-adblock-plus/PKGBUILD b/libre/iceweasel-adblock-plus/PKGBUILD
index 019d1edd2..81648fbcd 100644
--- a/libre/iceweasel-adblock-plus/PKGBUILD
+++ b/libre/iceweasel-adblock-plus/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 90899 2013-05-15 12:56:13Z spupykin $
+# $Id: PKGBUILD 94536 2013-07-26 13:15:58Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 
 _pkgname=firefox-adblock-plus
 pkgname=iceweasel-adblock-plus
-pkgver=2.2.4
+pkgver=2.3.1
 _addons_file=206960
-pkgrel=2
+pkgrel=1
 pkgdesc="plugin for iceweasel which block ads and banners"
 arch=('any')
 url="http://adblockplus.org/"
-- 
cgit v1.2.3-54-g00ecf


From a8224542bf713afef565d5ab9aaef2103ef4e2f2 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado <emulatorman@lavabit.com>
Date: Fri, 26 Jul 2013 20:19:59 -0300
Subject: soundkonverter-libre-2.0.4-1: updating version

---
 libre/soundkonverter-libre/PKGBUILD | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/libre/soundkonverter-libre/PKGBUILD b/libre/soundkonverter-libre/PKGBUILD
index b8872fa5d..5e87a1e8c 100644
--- a/libre/soundkonverter-libre/PKGBUILD
+++ b/libre/soundkonverter-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 92587 2013-06-09 14:53:02Z stativ $
+# $Id: PKGBUILD 94548 2013-07-26 17:20:11Z stativ $
 # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com>
 # Contributor: Mateusz Herych <heniekk@gmail.com>
 # Contributor: Eric Belanger <eric@archlinux.org>
@@ -7,7 +7,7 @@
 
 _pkgname=soundkonverter
 pkgname=soundkonverter-libre
-pkgver=2.0.3
+pkgver=2.0.4
 pkgrel=1
 pkgdesc="Front-end to various audio converters, without nonfree faac and mac recommendation"
 arch=('i686' 'x86_64')
@@ -36,7 +36,7 @@ conflicts=$_pkgname
 provides=$_pkgname=$pkgver
 install=$_pkgname.install
 source=("http://kde-apps.org/CONTENT/content-files/29024-${_pkgname}-${pkgver}.tar.gz")
-md5sums=('1c18d9227bac57a910e2a7b2e18870d8')
+md5sums=('8b6684e693bf1af604dec8fab837447b')
 
 build() {
   cd "$srcdir"/$_pkgname-$pkgver
@@ -47,6 +47,6 @@ build() {
 }
 
 package() {
-	cd "$srcdir"/$_pkgname-$pkgver
-	make DESTDIR="$pkgdir" install
+  cd "$srcdir"/$_pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
 }
-- 
cgit v1.2.3-54-g00ecf


From 17472cfea93dc052a20c158bb834ca943a6b5991 Mon Sep 17 00:00:00 2001
From: Márcio Alexandre Silva Delgado <coadde@lavabit.com>
Date: Fri, 26 Jul 2013 23:47:06 -0300
Subject: libav: updating pkg

---
 pcr/libav/PKGBUILD | 80 ++++++++++++++++++++++++++++--------------------------
 1 file changed, 41 insertions(+), 39 deletions(-)

diff --git a/pcr/libav/PKGBUILD b/pcr/libav/PKGBUILD
index 782e12a15..4b92e0118 100644
--- a/pcr/libav/PKGBUILD
+++ b/pcr/libav/PKGBUILD
@@ -1,21 +1,18 @@
 # Maintainer: Márcio Silva <coadde@lavabit.com>
 
-static=false
+_static=false # will be droped
+
 _pkgname=libav
-if [[ $static == true ]] || [[ $static == 1 ]] || [[ $static == enable ]]; then
-  pkgname=libav-static
-  pkgflag=-static
-  staticdesc=', with static library'
-elif [[ $static == false ]] || [[ $static == 0 ]] || [[ $static == disable ]]; then
-  pkgname=libav
-fi
-pkgver=9.7
-pkgrel=1
-pkgdesc="Complete and free Internet live audio and video broadcasting solution for GNU/Linux$staticdesc"
+pkgname=$_pkgname
+[[ $_static == true ]] && pkgname=$_pkgname-static
+pkgver=9.8
+pkgrel=2
+pkgdesc="Complete and free Internet live audio and video broadcasting solution for GNU/Linux"
+[[ $_static == true ]] && pkgdesc="Complete and free Internet live audio and video broadcasting solution for GNU/Linux, with static library"
 arch=(
-  i686
-  x86_64
   mips64el
+  x86_64
+  i686
 )
 url=http://$_pkgname.org/
 license=GPL3
@@ -46,19 +43,31 @@ makedepends=(
   libvdpau
 )
 source=http://$_pkgname.org/releases/$_pkgname-$pkgver.tar.gz
-sha512sums=6a446e8dceb9ee4f1fb7a7d68d254086990bbcab5b1014598b21c75e0add22dab47c30a95bc3129835cc40a8d32de9c61fb267b2fa2aa9353dbbfc4b716767e4
+sha512sums=ef7c164fb29d365a236ead927e6355ca9191203dce86f0d0d8251f275ed5be4ab5e3f56a0c51384d7b9e83c3c3ef7ebdee95c9a7ac7b6520eaf25973a2bd20ae
 
 build() {
   cd $_pkgname-$pkgver
-
-  [[ $static == false ]] && sttcv=disable || sttcv=enable
-
-  setarch $CARCH ./configure\
-    --prefix=/opt/$pkgname\
+  if [[ $CARCH == x86_64 ]]; then
+    _asm='--disable-armv5te --disable-armv6 --disable-armv6t2 --disable-neon --disable-vfp --disable-vis --disable-altivec\
+          --enable-amd3dnow --enable-mmx --enable-mmxext --enable-amd3dnow --enable-amd3dnowext --enable-sse --enable-sse2 --enable-sse3\
+          --enable-avx --enable-fma4 --enable-sse3 --enable-ssse3 --enable-sse4 --enable-sse42'
+  elif [[ $CARCH == i686 ]]; then
+    _asm='--disable-armv5te --disable-armv6 --disable-armv6t2 --disable-neon --disable-vfp --disable-vis --disable-altivec\
+          --enable-amd3dnow --enable-mmx --enable-mmxext --enable-amd3dnow --enable-amd3dnowext --enable-sse --enable-sse2 --enable-sse3\
+          --disable-avx --disable-fma4 --disable-sse3 --disable-ssse3 --disable-sse4 --disable-sse42'
+  else
+    _asm='--disable-asm'
+  fi
+  [[ $_static == false ]] && _stf='--disable-static'
+  ./configure\
+    $_asm $_stf\
+    --prefix=/usr\
+    --incdir=/usr/include/$pkgname\
+    --libdir=/usr/lib/$pkgname\
+    --shlibdir=/usr/lib/$pkgname\
+    --disable-avserver\
     --disable-debug\
-    --$sttcv-static\
     --enable-avresample\
-    --enable-avserver\
     --enable-dxva2\
     --enable-gpl\
     --enable-libfreetype\
@@ -77,32 +86,25 @@ build() {
     --enable-libvpx\
     --enable-libx264\
     --enable-libxvid\
+    --enable-pic\
     --enable-runtime-cpudetect\
     --enable-shared\
+    --enable-vdpau\
     --enable-version3\
     --enable-x11grab
-  setarch $CARCH make
-  setarch $CARCH make tools/qt-faststart
-  setarch $CARCH make doc/av{conv,play,server}.1
+  make
+  make tools/qt-faststart
+  make doc/av{conv,play}.1 # doc/avserver.1
 }
 
 package() {
   cd $_pkgname-$pkgver
-  setarch $CARCH 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/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
-  echo /opt/libav$pkgflag/lib                 > $pkgdir/etc/ld.so.conf.d/libav$pkgflag.conf
+
+  make DESTDIR=$pkgdir install install-man
+  install -dDm755 tools/qt-faststart $pkgdir/usr/bin/qt-faststart-$_pkgname
+
+  install -vd $pkgdir/etc/ld.so.conf.d
+  echo /usr/lib/$pkgname > $pkgdir/etc/ld.so.conf.d/$pkgname.conf
 }
 
 # vim:set ts=2 sw=2 et:
-- 
cgit v1.2.3-54-g00ecf


From 96cb95a5b71b95748d84fe871669d52c57e1fe3c Mon Sep 17 00:00:00 2001
From: Márcio Alexandre Silva Delgado <coadde@lavabit.com>
Date: Sat, 27 Jul 2013 00:01:46 -0300
Subject: libav: fixing type

---
 pcr/libav/PKGBUILD | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pcr/libav/PKGBUILD b/pcr/libav/PKGBUILD
index 4b92e0118..fdbab6a89 100644
--- a/pcr/libav/PKGBUILD
+++ b/pcr/libav/PKGBUILD
@@ -101,7 +101,7 @@ package() {
   cd $_pkgname-$pkgver
 
   make DESTDIR=$pkgdir install install-man
-  install -dDm755 tools/qt-faststart $pkgdir/usr/bin/qt-faststart-$_pkgname
+  install -vDm755 tools/qt-faststart $pkgdir/usr/bin/qt-faststart-$_pkgname
 
   install -vd $pkgdir/etc/ld.so.conf.d
   echo /usr/lib/$pkgname > $pkgdir/etc/ld.so.conf.d/$pkgname.conf
-- 
cgit v1.2.3-54-g00ecf


From bfa2eb7a80c004edb7a795c79a2915a1fc65bc07 Mon Sep 17 00:00:00 2001
From: Márcio Alexandre Silva Delgado <coadde@lavabit.com>
Date: Sat, 27 Jul 2013 02:11:47 -0300
Subject: libav: fixing pkg

---
 pcr/libav/PKGBUILD | 32 +++++++++++++++-----------------
 1 file changed, 15 insertions(+), 17 deletions(-)

diff --git a/pcr/libav/PKGBUILD b/pcr/libav/PKGBUILD
index fdbab6a89..c0fb9e062 100644
--- a/pcr/libav/PKGBUILD
+++ b/pcr/libav/PKGBUILD
@@ -1,20 +1,15 @@
 # Maintainer: Márcio Silva <coadde@lavabit.com>
 
-_static=false # will be droped
-
-_pkgname=libav
-pkgname=$_pkgname
-[[ $_static == true ]] && pkgname=$_pkgname-static
+pkgname=libav
 pkgver=9.8
-pkgrel=2
+pkgrel=3
 pkgdesc="Complete and free Internet live audio and video broadcasting solution for GNU/Linux"
-[[ $_static == true ]] && pkgdesc="Complete and free Internet live audio and video broadcasting solution for GNU/Linux, with static library"
 arch=(
   mips64el
   x86_64
   i686
 )
-url=http://$_pkgname.org/
+url=http://$pkgname.org/
 license=GPL3
 depends=(
   alsa-lib
@@ -42,11 +37,11 @@ makedepends=(
   yasm
   libvdpau
 )
-source=http://$_pkgname.org/releases/$_pkgname-$pkgver.tar.gz
+source=http://$pkgname.org/releases/$pkgname-$pkgver.tar.gz
 sha512sums=ef7c164fb29d365a236ead927e6355ca9191203dce86f0d0d8251f275ed5be4ab5e3f56a0c51384d7b9e83c3c3ef7ebdee95c9a7ac7b6520eaf25973a2bd20ae
 
 build() {
-  cd $_pkgname-$pkgver
+  cd $pkgname-$pkgver
   if [[ $CARCH == x86_64 ]]; then
     _asm='--disable-armv5te --disable-armv6 --disable-armv6t2 --disable-neon --disable-vfp --disable-vis --disable-altivec\
           --enable-amd3dnow --enable-mmx --enable-mmxext --enable-amd3dnow --enable-amd3dnowext --enable-sse --enable-sse2 --enable-sse3\
@@ -62,9 +57,10 @@ build() {
   ./configure\
     $_asm $_stf\
     --prefix=/usr\
-    --incdir=/usr/include/$pkgname\
-    --libdir=/usr/lib/$pkgname\
-    --shlibdir=/usr/lib/$pkgname\
+    --bindir=/opt/$pkgname/bin\
+    --incdir=/opt/$pkgname/include\
+    --libdir=/opt/$pkgname/lib\
+    --shlibdir=/opt/$pkgname/lib\
     --disable-avserver\
     --disable-debug\
     --enable-avresample\
@@ -98,13 +94,15 @@ build() {
 }
 
 package() {
-  cd $_pkgname-$pkgver
+  cd $pkgname-$pkgver
 
   make DESTDIR=$pkgdir install install-man
-  install -vDm755 tools/qt-faststart $pkgdir/usr/bin/qt-faststart-$_pkgname
+  install -vD tools/qt-faststart $pkgdir/usr/bin/qt-faststart-$pkgname
 
-  install -vd $pkgdir/etc/ld.so.conf.d
-  echo /usr/lib/$pkgname > $pkgdir/etc/ld.so.conf.d/$pkgname.conf
+  for _bin in conv play probe; do
+    echo -e "#!/usr/bin/env bash\nLD_LIBRARY_PATH=/opt/$pkgname/lib /opt/$pkgname/bin/av$_bin \$@" > $pkgdir/usr/bin/av$_bin
+  done
+  chmod -v +x $pkgdir/usr/bin/*
 }
 
 # vim:set ts=2 sw=2 et:
-- 
cgit v1.2.3-54-g00ecf