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

9 files changed, 135 insertions, 35 deletions

diff --git a/.gitignore b/.gitignore
index e28a2ea64..74817ef36 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ pkg/
 *.tar*
 *.tgz
 *.zip
+*.orig
diff --git a/libre/mplayer-libre/PKGBUILD b/libre/mplayer-libre/PKGBUILD
index 583b679ca..936dc402a 100644
--- a/libre/mplayer-libre/PKGBUILD
+++ b/libre/mplayer-libre/PKGBUILD
@@ -2,25 +2,28 @@
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Hugo Doria <hugo@archlinux.org>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Contributor (Parabola): Márcio Silva <coadde@lavabit.com>
 
 _pkgbase=mplayer
 pkgbase=mplayer-libre
 pkgname=('mplayer-libre' 'mencoder-libre')
 pkgver=35421
-pkgrel=1.1
-arch=('i686' 'x86_64')
+pkgrel=2
+arch=('i686' 'x86_64' 'mips64el')
 makedepends=('libxxf86dga' 'libxxf86vm' 'libmad' 'libxinerama' 'sdl' 'lame' 'libtheora' 'xvidcore' 'libmng' 'libxss' 'libgl' 'smbclient'
 'aalib' 'jack' 'libcaca' 'x264' 'faad2' 'lirc-utils'  'libxvmc' 'enca' 'libvdpau' 'opencore-amr' 'libdca' 'a52dec' 'schroedinger' 'libvpx'
-'libpulse' 'fribidi' 'unzip-libre' 'mesa' 'live-media' 'yasm' 'git' 'fontconfig' 'mpg123' 'ladspa' 'libass' 'libbluray' 'libcdio' 'subversion')
+'libpulse' 'fribidi' 'unzip-libre' 'mesa' 'live-media' 'yasm' 'git' 'fontconfig' 'mpg123' 'ladspa' 'libass' 'libbluray' 'libcdio-paranoia' 'subversion')
 license=('GPL')
 url="http://www.mplayerhq.hu/"
 options=(!buildflags !emptydirs)
-source=(ftp://ftp.archlinux.org/other/$_pkgbase/$_pkgbase-$pkgver.tar.xz mplayer.desktop)
-md5sums=('b8a82ad1e1d6c3ac847074772daba817'
-         'c0d6ef795cf6de48e3b87ff7c23f0319')
+source=(ftp://ftp.archlinux.org/other/$_pkgbase/$_pkgbase-$pkgver.tar.xz mplayer.desktop cdio-includes.patch)
+md5sums=('b5d8c24fc106b4ed58acda3b86c468fa'
+         'c0d6ef795cf6de48e3b87ff7c23f0319'
+         'dcf64a9113ecb99ec102108c901159e3')
 
 build() {
     cd "$srcdir/$_pkgbase"
+    patch -Np0 -i ../cdio-includes.patch
 
     ./configure --prefix=/usr \
         --enable-runtime-cpudetection \
@@ -51,7 +54,7 @@ package_mplayer-libre() {
     backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf')
     depends=('desktop-file-utils' 'ttf-dejavu' 'enca' 'libxss' 'a52dec' 'libvpx' 'lirc-utils' 'x264' 'libmng' 'libdca' 'aalib' 'lame' 'fontconfig'  'libgl'
     'libxinerama' 'libvdpau' 'libpulse' 'smbclient' 'xvidcore' 'opencore-amr' 'jack' 'libmad' 'sdl' 'libtheora' 'libcaca' 'libxxf86dga' 'fribidi'
-    'libjpeg' 'faad2' 'libxvmc' 'schroedinger' 'mpg123' 'libass' 'libxxf86vm' 'libbluray' 'libcdio')
+    'libjpeg' 'faad2' 'libxvmc' 'schroedinger' 'mpg123' 'libass' 'libxxf86vm' 'libbluray' 'libcdio-paranoia')
     provides=("mplayer=$pkgver")
     replaces=('mplayer')
     conflicts=('mplayer')
@@ -71,7 +74,7 @@ package_mplayer-libre() {
 package_mencoder-libre() {
     pkgdesc="Free command line video decoding, encoding and filtering tool (without unfree faac support)"
     depends=('enca' 'a52dec' 'libvpx' 'x264' 'libmng' 'libdca' 'bzip2' 'lame' 'alsa-lib' 'fontconfig' 'giflib' 'libpng' 'smbclient' 'xvidcore' 'opencore-amr'
-    'libmad' 'libtheora' 'fribidi' 'libjpeg' 'faad2' 'schroedinger' 'mpg123' 'libass' 'libbluray' 'libcdio' 'libvorbis')
+    'libmad' 'libtheora' 'fribidi' 'libjpeg' 'faad2' 'schroedinger' 'mpg123' 'libass' 'libbluray' 'libcdio-paranoia' 'libvorbis')
     provides=("mencoder=$pkgver")
     replaces=('mencoder')
     conflicts=('mencoder')
@@ -80,5 +83,3 @@ package_mencoder-libre() {
     make DESTDIR="$pkgdir" install-mencoder install-mencoder-man
     find "$pkgdir/usr/share/man" -name 'mplayer.1' -exec bash -c 'mv "$1" "${1/mplayer/mencoder}"' _ {} \;
 }
-md5sums=('b5d8c24fc106b4ed58acda3b86c468fa'
-         'c0d6ef795cf6de48e3b87ff7c23f0319')
diff --git a/libre/mplayer-libre/cdio-includes.patch b/libre/mplayer-libre/cdio-includes.patch
new file mode 100644
index 000000000..894650717
--- /dev/null
+++ b/libre/mplayer-libre/cdio-includes.patch
@@ -0,0 +1,43 @@
+Index: configure
+===================================================================
+--- configure	(revision 35421)
++++ configure	(working copy)
+@@ -5968,8 +5968,8 @@
+         cat > $TMPC << EOF
+ #include <stdio.h>
+ #include <cdio/version.h>
+-#include <cdio/cdda.h>
+-#include <cdio/paranoia.h>
++#include <cdio/paranoia/cdda.h>
++#include <cdio/paranoia/paranoia.h>
+ int main(void) {
+     void *test = cdda_verbose_set;
+     printf("%s\n", CDIO_VERSION);
+Index: gui/win32/interface.c
+===================================================================
+--- gui/win32/interface.c	(revision 35421)
++++ gui/win32/interface.c	(working copy)
+@@ -24,7 +24,7 @@
+ #include "config.h"
+
+ #if defined(CONFIG_LIBCDIO)
+-#include <cdio/cdda.h>
++#include <cdio/paranoia/cdda.h>
+ #elif defined(CONFIG_CDDA)
+ #include <cdda_interface.h>
+ #endif
+Index: stream/stream_cdda.c
+===================================================================
+--- stream/stream_cdda.c	(revision 35421)
++++ stream/stream_cdda.c	(working copy)
+@@ -21,8 +21,8 @@
+ #include <cdda_interface.h>
+ #include <cdda_paranoia.h>
+ #else
+-#include <cdio/cdda.h>
+-#include <cdio/paranoia.h>
++#include <cdio/paranoia/cdda.h>
++#include <cdio/paranoia/paranoia.h>
+ #endif
+ #include <stdio.h>
+ #include <stdlib.h>
diff --git a/libre/mplayer-vaapi-libre/PKGBUILD b/libre/mplayer-vaapi-libre/PKGBUILD
index c5b33cf75..f1042a9b1 100644
--- a/libre/mplayer-vaapi-libre/PKGBUILD
+++ b/libre/mplayer-vaapi-libre/PKGBUILD
@@ -4,17 +4,18 @@
 # Contributor: Hugo Doria <hugo@archlinux.org>
 # Maintainer (Parabola): fauno <fauno@kiwwwi.com.ar>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Contributor (Parabola): Márcio Silva <coadde@lavabit.com>
 
 pkgname=mplayer-vaapi-libre
 pkgver=35107
-pkgrel=3.1
+pkgrel=4
 pkgdesc="A movie player, compiled with vaapi (without unfree faac support)"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://gitorious.org/vaapi/mplayer"
 license=('GPL')
-depends=('libxxf86dga' 'libxxf86vm' 'libmad' 'libcdio' 'libxinerama' 'sdl'
+depends=('libxxf86dga' 'libxxf86vm' 'libmad' 'libcdio-paranoia' 'libxinerama'
          'lame' 'fontconfig' 'libtheora' 'xvidcore' 'libmng' 'libxss' 'glu'
-         'smbclient' 'aalib' 'jack' 'libcaca' 'x264' 'speex' 'faad2'
+         'sdl' 'smbclient' 'aalib' 'jack' 'libcaca' 'x264' 'speex' 'faad2'
          'lirc-utils' 'ttf-dejavu' 'libxvmc' 'enca' 'opencore-amr' 'libdca'
          'a52dec' 'schroedinger' 'mpg123' 'libvpx' 'libpulse' 'fribidi'
          'libbluray' 'libva' 'libass' 'desktop-file-utils')
@@ -24,15 +25,18 @@ conflicts=('mplayer' 'mplayer-vaapi')
 replaces=('mplayer-vaapi')
 backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf')
 source=(http://pkgbuild.com/~foutrelis/mplayer-vaapi-$pkgver.tar.xz
+        cdio-includes.patch
         tweak-desktop-file.patch)
 options=('!buildflags' '!emptydirs')
 install=mplayer-vaapi.install
 sha256sums=('a6c645625cc2cd6ca48764db302c926049f831e757857ece351b37b674e05e56'
+            '72e6c654f9733953ad2466d0ea1a52f23e753791d8232d90f13293eb1b358720'
             '5a09fb462729a4e573568f9e8c1f57dbe7f69c0b68cfa4f6d70b3e52c450d93b')
 
 build() {
   cd "$srcdir/mplayer-vaapi-$pkgver"
 
+  patch -Np0 -i "$srcdir/cdio-includes.patch"
   patch -d etc -Np0 -i "$srcdir/tweak-desktop-file.patch"
 
   ./configure \
diff --git a/libre/mplayer-vaapi-libre/cdio-includes.patch b/libre/mplayer-vaapi-libre/cdio-includes.patch
new file mode 100644
index 000000000..894650717
--- /dev/null
+++ b/libre/mplayer-vaapi-libre/cdio-includes.patch
@@ -0,0 +1,43 @@
+Index: configure
+===================================================================
+--- configure	(revision 35421)
++++ configure	(working copy)
+@@ -5968,8 +5968,8 @@
+         cat > $TMPC << EOF
+ #include <stdio.h>
+ #include <cdio/version.h>
+-#include <cdio/cdda.h>
+-#include <cdio/paranoia.h>
++#include <cdio/paranoia/cdda.h>
++#include <cdio/paranoia/paranoia.h>
+ int main(void) {
+     void *test = cdda_verbose_set;
+     printf("%s\n", CDIO_VERSION);
+Index: gui/win32/interface.c
+===================================================================
+--- gui/win32/interface.c	(revision 35421)
++++ gui/win32/interface.c	(working copy)
+@@ -24,7 +24,7 @@
+ #include "config.h"
+
+ #if defined(CONFIG_LIBCDIO)
+-#include <cdio/cdda.h>
++#include <cdio/paranoia/cdda.h>
+ #elif defined(CONFIG_CDDA)
+ #include <cdda_interface.h>
+ #endif
+Index: stream/stream_cdda.c
+===================================================================
+--- stream/stream_cdda.c	(revision 35421)
++++ stream/stream_cdda.c	(working copy)
+@@ -21,8 +21,8 @@
+ #include <cdda_interface.h>
+ #include <cdda_paranoia.h>
+ #else
+-#include <cdio/cdda.h>
+-#include <cdio/paranoia.h>
++#include <cdio/paranoia/cdda.h>
++#include <cdio/paranoia/paranoia.h>
+ #endif
+ #include <stdio.h>
+ #include <stdlib.h>
diff --git a/~fauno/pandoc/PKGBUILD b/pcr/pandoc/PKGBUILD
index 18e249a47..009d47398 100644
--- a/~fauno/pandoc/PKGBUILD
+++ b/pcr/pandoc/PKGBUILD
@@ -1,11 +1,11 @@
 # Maintainer: Nicolas Reynolds <fauno@kiwwwi.com.ar>
 # Based on haskell-pandoc
 
-# Run `makepkg -srp SRCBUILD` if you want to update the source tarball
+# Run `makepkg -sp SRCBUILD` if you want to update the source tarball
 
 pkgname=pandoc
 pkgver=1.9.4.5
-pkgrel=3
+pkgrel=5
 pkgdesc='Conversion between markup formats (no Haskell libs)'
 url='http://johnmacfarlane.net/pandoc/'
 license=('GPL')
@@ -15,9 +15,6 @@ options=(strip !makeflags !distcc)
 source=(https://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}-$pkgrel-any.src.tar.xz{,.sig} SRCBUILD)
 conflicts=('haskell-pandoc')
 optdepends=('texlive-most: for pdf creation')
-md5sums=('912abc4574aea3c5203eff1b02ceafa9'
-         '7ac798d62f253535a2e194af5aa1c3c3'
-         'e632f8c06be8284e17329a5d1c459e3b')
 
 # PKGBUILD functions
 build() {
@@ -72,3 +69,6 @@ package() {
   find ${pkgdir}/usr/share -type f -exec chmod 644 {} \;
   find ${pkgdir}/usr/share -type d -exec chmod 755 {} \;
 }
+md5sums=('af01e55daded42fa54e8a2bb142c0a78'
+         '96d0ba0d9060574e56e3f23c996d0e8e'
+         '54b521d5c3ed5e2b53c4ca3206f6c941')
diff --git a/~fauno/pandoc/SRCBUILD b/pcr/pandoc/SRCBUILD
index ebe1a0552..1eb01acc1 100644
--- a/~fauno/pandoc/SRCBUILD
+++ b/pcr/pandoc/SRCBUILD
@@ -5,7 +5,9 @@ pkgname=pandoc
 pkgver=1.9.4.5
 # 0.3.6 fails with embed_data_files
 _citeproc=0.3.5
-pkgrel=3
+# 0.4 doesn't work with ghc 7.6 
+_blaze_html=0.5.1.3
+pkgrel=5
 pkgdesc='Conversion between markup formats (no Haskell libs)'
 url='http://johnmacfarlane.net/pandoc/'
 license=('GPL')
@@ -23,12 +25,12 @@ build() {
     cabal --verbose=3 update
 
     HOME=${srcdir}/${pkgname}-${pkgver} \
-    cabal --verbose=3 fetch file-embed citeproc-hs-${_citeproc} ${pkgname}-${pkgver}
+    cabal --verbose=3 fetch file-embed blaze-html-${_blaze_html} citeproc-hs-${_citeproc} ${pkgname}-${pkgver}
 
     msg2 "Getting the dependency build order"
 # Ignore the cabal messages
     HOME=${srcdir}/${pkgname}-${pkgver} \
-    cabal install --dry-run file-embed citeproc-hs-${_citeproc} ${pkgname}-${pkgver} | grep "\-[0-9]\+" >>BUILDORDER 
+    cabal install --dry-run file-embed blaze-html-${_blaze_html} citeproc-hs-${_citeproc} ${pkgname}-${pkgver} | grep "\-[0-9]\+" >>BUILDORDER 
 }
 
 package() {
diff --git a/social/libowfat/PKGBUILD b/social/libowfat/PKGBUILD
index ea43adfab..4962068fb 100644
--- a/social/libowfat/PKGBUILD
+++ b/social/libowfat/PKGBUILD
@@ -4,8 +4,8 @@
 # 	henning mueller <henning@orgizm.net>
 
 pkgname=libowfat
-pkgver=0.28
-pkgrel=4
+pkgver=0.29
+pkgrel=1
 pkgdesc='GPL reimplementation of libdjb'
 arch=(i686 x86_64)
 url=http://www.fefe.de/libowfat/
diff --git a/social/opentracker/PKGBUILD b/social/opentracker/PKGBUILD
index f328607e7..2826a21ef 100644
--- a/social/opentracker/PKGBUILD
+++ b/social/opentracker/PKGBUILD
@@ -1,8 +1,9 @@
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
+# Maintainer: Jonas Heinrich <onny@project-insanity.org>
 
 pkgname=opentracker
-pkgver=20111020
-pkgrel=1
+pkgver=20120911
+pkgrel=2
 pkgdesc='An open and free bittorrent tracker (open mode)'
 arch=('i686' 'x86_64')
 url='http://erdgeist.org/arts/software/opentracker/'
@@ -10,13 +11,12 @@ license=('custom:Beer' 'GPL')
 makedepends=('libowfat' 'cvs')
 depends=('bash' 'zlib')
 backup=('etc/opentracker/config')
-install=${pkgname}.install
-source=("http://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}.tar.gz"
-        'opentracker.rc.d'
-        'license.txt')
-md5sums=('1dbace4895b4e1d290790f8ebacb2a2f'
-         '390bde9d010e79ab1309c02dcf9972e8'
-         '865211941e882c0aff5d36a22ac9efaa')
+source=('opentracker.rc'
+'opentracker.service'
+'license.txt')
+md5sums=('390bde9d010e79ab1309c02dcf9972e8'
+'3c638b71d5ecb65fb7964796975b2078'
+'865211941e882c0aff5d36a22ac9efaa')
 
 _cvsroot=':pserver:anoncvs@cvs.erdgeist.org:/home/cvsroot'
 _cvsmod='opentracker'
@@ -42,7 +42,6 @@ build() {
 	cd "${srcdir}/${_cvsmod}"
 	msg 'Starting make...'
 
-
 	sed	-e 's|# tracker.rootdir /usr/local/etc/opentracker|tracker.rootdir /etc/opentracker|' \
 		-e 's|# access.stats 192.168.0.23|access.stats 127.0.0.1|' \
 		-i opentracker.conf.sample
@@ -58,7 +57,14 @@ package(){
 	cd "${srcdir}/${_cvsmod}"
 
 	install -D -m 755 opentracker $pkgdir/usr/bin/opentracker
-	install -D -m 755 $srcdir/opentracker.rc.d $pkgdir/etc/rc.d/opentracker
 	install -D -m 644 opentracker.conf.sample $pkgdir/etc/opentracker/config
 	install -D -m 644 $srcdir/license.txt $pkgdir/usr/share/licenses/opentracker/license.txt
+
+  # create /etc/rc.d/opentracker
+  mkdir -p "$pkgdir/etc/rc.d/"
+  install -m 755 "$srcdir/opentracker.rc" "$pkgdir/etc/rc.d/opentracker"
+
+  # Create opentracker service
+  mkdir -p "$pkgdir/usr/lib/systemd/system/"
+  install -m 644 "$srcdir/opentracker.service" "$pkgdir/usr/lib/systemd/system/"
 }