Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/adns/PKGBUILD
	community/afpfs-ng/PKGBUILD
	community/aqbanking/PKGBUILD
	community/arp-scan/PKGBUILD
	community/arpack/PKGBUILD
	community/bind/PKGBUILD
	community/bird/PKGBUILD
	community/cairo-dock/PKGBUILD
	community/cinnamon-control-center/PKGBUILD
	community/commoncpp2/PKGBUILD
	community/cuetools/PKGBUILD
	community/erlang/PKGBUILD
	community/fxdesktop/PKGBUILD
	community/gavl/PKGBUILD
	community/google-gadgets/PKGBUILD
	community/gpicview/PKGBUILD
	community/gtk-aurora-engine/PKGBUILD
	community/icewm-utils/PKGBUILD
	community/inotify-tools/PKGBUILD
	community/jack2/PKGBUILD
	community/judy/PKGBUILD
	community/lash/PKGBUILD
	community/libdlna/PKGBUILD
	community/libgexiv2/PKGBUILD
	community/libgig/PKGBUILD
	community/liblinebreak/PKGBUILD
	community/liblockfile/PKGBUILD
	community/libopenraw/PKGBUILD
	community/librcd/PKGBUILD
	community/librsync/PKGBUILD
	community/libvirt/PKGBUILD
	community/libyaml/PKGBUILD
	community/linux-tools/PKGBUILD
	community/lomoco/PKGBUILD
	community/luasec/PKGBUILD
	community/luasocket/PKGBUILD
	community/lwp/PKGBUILD
	community/lxappearance-obconf/PKGBUILD
	community/lxappearance/PKGBUILD
	community/lxsplit/PKGBUILD
	community/metamail/PKGBUILD
	community/mg/PKGBUILD
	community/nemo-fileroller/PKGBUILD
	community/nsd/PKGBUILD
	community/obby/PKGBUILD
	community/openarena/PKGBUILD
	community/opensc/PKGBUILD
	community/osmo/PKGBUILD
	community/perl-json-xs/PKGBUILD
	community/pyqt3/PKGBUILD
	community/python-pymongo/PKGBUILD
	community/python-pytables/PKGBUILD
	community/qscintilla-qt3/PKGBUILD
	community/qtcurve-gtk2/PKGBUILD
	community/qtcurve-kde4/PKGBUILD
	community/rxvt-unicode/PKGBUILD
	community/smalltalk/PKGBUILD
	community/xmlrpc-c/PKGBUILD
	community/xpad/PKGBUILD
	community/xsettings-client/PKGBUILD
	community/yaws/PKGBUILD
	core/bzip2/PKGBUILD
	core/gcc/PKGBUILD
	core/glibc/PKGBUILD
	core/keyutils/PKGBUILD
	core/ldns/PKGBUILD
	core/libmpc/PKGBUILD
	core/librpcsecgss/PKGBUILD
	core/libtool/PKGBUILD
	core/lvm2/PKGBUILD
	core/lzo2/PKGBUILD
	core/openssl/PKGBUILD
	core/systemd/PKGBUILD
	core/sysvinit-tools/PKGBUILD
	cross/mips64el-unknown-linux-gnu-linux-libre-api-headers/PKGBUILD
	extra/aalib/PKGBUILD
	extra/aiksaurus/PKGBUILD
	extra/alsa-oss/PKGBUILD
	extra/alsa-tools/PKGBUILD
	extra/apache/PKGBUILD
	extra/autopano-sift-c/PKGBUILD
	extra/avahi/PKGBUILD
	extra/cfitsio/PKGBUILD
	extra/clamav/PKGBUILD
	extra/compface/PKGBUILD
	extra/dotconf/PKGBUILD
	extra/enca/PKGBUILD
	extra/eventlog/PKGBUILD
	extra/exiv2/PKGBUILD
	extra/faad2/PKGBUILD
	extra/fcgi/PKGBUILD
	extra/ffcall/PKGBUILD
	extra/ffmpeg/PKGBUILD
	extra/flac/PKGBUILD
	extra/fltk/PKGBUILD
	extra/freealut/PKGBUILD
	extra/freetds/PKGBUILD
	extra/gc/PKGBUILD
	extra/gdome2/PKGBUILD
	extra/giblib/PKGBUILD
	extra/gmime/PKGBUILD
	extra/gnome-python-desktop/PKGBUILD
	extra/gnome-python-extras/PKGBUILD
	extra/gnome-speech/PKGBUILD
	extra/graphviz/PKGBUILD
	extra/gsasl/PKGBUILD
	extra/gsl/PKGBUILD
	extra/gtkspell/PKGBUILD
	extra/gupnp-igd/PKGBUILD
	extra/htdig/PKGBUILD
	extra/hugin/PKGBUILD
	extra/id3lib/PKGBUILD
	extra/ilmbase/PKGBUILD
	extra/imagemagick/PKGBUILD
	extra/iptraf-ng/PKGBUILD
	extra/jade/PKGBUILD
	extra/jasper/PKGBUILD
	extra/kdesdk-thumbnailers/PKGBUILD
	extra/kdevelop-php/PKGBUILD
	extra/lablgtk/PKGBUILD
	extra/lame/PKGBUILD
	extra/lcms2/PKGBUILD
	extra/lesstif/PKGBUILD
	extra/libaio/PKGBUILD
	extra/libart-lgpl/PKGBUILD
	extra/libass/PKGBUILD
	extra/libasyncns/PKGBUILD
	extra/libavc1394/PKGBUILD
	extra/libbluray/PKGBUILD
	extra/libcaca/PKGBUILD
	extra/libcddb/PKGBUILD
	extra/libchamplain/PKGBUILD
	extra/libdca/PKGBUILD
	extra/libdv/PKGBUILD
	extra/libglade/PKGBUILD
	extra/libgtkhtml/PKGBUILD
	extra/libice/PKGBUILD
	extra/libid3tag/PKGBUILD
	extra/libidl2/PKGBUILD
	extra/libieee1284/PKGBUILD
	extra/libjpeg-turbo/PKGBUILD
	extra/liblo/PKGBUILD
	extra/libmad/PKGBUILD
	extra/libmikmod/PKGBUILD
	extra/libmowgli/PKGBUILD
	extra/libmpd/PKGBUILD
	extra/libmpdclient/PKGBUILD
	extra/libofa/PKGBUILD
	extra/liboil/PKGBUILD
	extra/libotf/PKGBUILD
	extra/libpeas/PKGBUILD
	extra/libqalculate/PKGBUILD
	extra/libraw1394/PKGBUILD
	extra/libsndfile/PKGBUILD
	extra/libstroke/PKGBUILD
	extra/libvncserver/PKGBUILD
	extra/libxkbui/PKGBUILD
	extra/libxss/PKGBUILD
	extra/libytnef/PKGBUILD
	extra/libzvt/PKGBUILD
	extra/lynx/PKGBUILD
	extra/lzo/PKGBUILD
	extra/mariadb/PKGBUILD
	extra/mesa/PKGBUILD
	extra/mhash/PKGBUILD
	extra/musicbrainz/PKGBUILD
	extra/ocaml/PKGBUILD
	extra/openal/PKGBUILD
	extra/openmpi/PKGBUILD
	extra/pavucontrol/PKGBUILD
	extra/perl-dbi/PKGBUILD
	extra/phonon-vlc/PKGBUILD
	extra/phonon/PKGBUILD
	extra/ppl/PKGBUILD
	extra/progsreiserfs/PKGBUILD
	extra/pulseaudio/PKGBUILD
	extra/pycurl/PKGBUILD
	extra/pyopenssl/PKGBUILD
	extra/pyxml/PKGBUILD
	extra/qt4/PKGBUILD
	extra/qt5/PKGBUILD
	extra/qtwebkit/PKGBUILD
	extra/schroedinger/PKGBUILD
	extra/sdl_gfx/PKGBUILD
	extra/signon/PKGBUILD
	extra/slang/PKGBUILD
	extra/sofia-sip/PKGBUILD
	extra/spandsp/PKGBUILD
	extra/speech-dispatcher/PKGBUILD
	extra/sqlite/PKGBUILD
	extra/t1lib/PKGBUILD
	extra/taglib/PKGBUILD
	extra/tidyhtml/PKGBUILD
	extra/totem/PKGBUILD
	extra/unixodbc/PKGBUILD
	extra/vigra/PKGBUILD
	extra/virtuoso/PKGBUILD
	extra/wavpack/PKGBUILD
	extra/webkitgtk/PKGBUILD
	extra/webrtc-audio-processing/PKGBUILD
	extra/xfce4-mailwatch-plugin/PKGBUILD
	extra/xine-lib/PKGBUILD
	extra/xmms/PKGBUILD
	extra/xorg-server/PKGBUILD
	extra/yajl/PKGBUILD
	extra/yasm/PKGBUILD
	extra/zenity/PKGBUILD
	extra/zziplib/PKGBUILD
	libre/blackbox-libre/PKGBUILD
	libre/linux-libre/PKGBUILD
	libre/sdl-libre/PKGBUILD

1 files changed, 54 insertions, 29 deletions

diff --git a/libre/mplayer-libre/PKGBUILD b/libre/mplayer-libre/PKGBUILD
index a5bda5d85..3f8b45dfe 100644
--- a/libre/mplayer-libre/PKGBUILD
+++ b/libre/mplayer-libre/PKGBUILD
@@ -1,39 +1,47 @@
-# $Id: PKGBUILD 193127 2013-08-17 00:43:52Z eric $
+# $Id: PKGBUILD 198698 2013-11-02 08:09:59Z bpiotrowski $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Hugo Doria <hugo@archlinux.org>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
 # Contributor (Parabola): Márcio Silva <coadde@lavabit.com>
 
 _pkgbase=mplayer
 pkgbase=mplayer-libre
 pkgname=('mplayer-libre' 'mencoder-libre')
-pkgver=36285
-pkgrel=4
+pkgver=36498
+pkgrel=2
 arch=('i686' 'x86_64')
-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' 'mesa' 'live-media' 'yasm' 'git' 'fontconfig' 'mpg123' 'ladspa' 'libass' 'libbluray' 'libcdio-paranoia' 'subversion')
+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' 'mesa'
+    'live-media' 'yasm' 'git' 'fontconfig' 'mpg123' 'ladspa' 'libass' 'libbluray'
+    'libcdio-paranoia' 'opus'
+    )
 license=('GPL')
-url="http://www.mplayerhq.hu/"
+url='http://www.mplayerhq.hu/'
 options=('!buildflags' '!emptydirs')
 source=(ftp://ftp.archlinux.org/other/packages/$_pkgbase/$_pkgbase-$pkgver.tar.xz
+        http://ffmpeg.org/releases/ffmpeg-2.1.tar.bz2
         mplayer.desktop
         cdio-includes.patch
-        0001-demux_gif-declare-missing-PrintGifError.patch)
-md5sums=('5e4f0d4d039b0219514cf52ae6da831d'
-         'c0d6ef795cf6de48e3b87ff7c23f0319'
+        include-samba-4.0.patch)
+md5sums=('8b856e8833d910b6e38b04bb8453d0dc'
+         '4ec1cedd4c7753512462f70b347c338a'
+         '62f44a58f072b2b1a3c3d3e4976d64b3'
          '7b5be7191aafbea64218dc4916343bbc'
-         '12a2a5b79849d57eab60a1bfec2978c4')
+         '868a92bdef148df7f38bfa992b26ce9d')
 
 prepare() {
-    cd "$srcdir/$_pkgbase-$pkgver"
+    cd $_pkgbase-$pkgver
+    patch -p0 -i ../cdio-includes.patch
+    patch -p1 -i ../include-samba-4.0.patch
 
-    patch -Np0 -i ../cdio-includes.patch
-    patch -Np1 -i ../0001-demux_gif-declare-missing-PrintGifError.patch
+    mv ../ffmpeg-2.1 ./ffmpeg
 }
 
 build() {
-    cd "$srcdir/$_pkgbase-$pkgver"
+    cd $_pkgbase-$pkgver
 
     ./configure --prefix=/usr \
         --enable-runtime-cpudetection \
@@ -51,9 +59,10 @@ build() {
         --enable-xvmc \
         --enable-radio \
         --enable-radio-capture \
+        --enable-smb \
         --language=all \
         --confdir=/etc/mplayer 
-    [ "$CARCH" = "i686" ] &&  sed 's|-march=i486|-march=i686|g' -i config.mak
+    [[ "$CARCH" = "i686" ]] &&  sed 's|-march=i486|-march=i686|g' -i config.mak
 
     make
 }
@@ -62,34 +71,50 @@ package_mplayer-libre() {
     pkgdesc="A movie player for GNU/Linux, without nonfree faac support"
     install=mplayer.install
     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-paranoia')
+    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-paranoia' 'opus'
+    )
     provides=("mplayer=$pkgver")
     replaces=('mplayer')
     conflicts=('mplayer')
 
-    cd "$srcdir/$_pkgbase-$pkgver"
-
+    cd $_pkgbase-$pkgver
     make DESTDIR="$pkgdir" install-mplayer install-mplayer-man
-    install -Dm644 etc/{codecs.conf,input.conf,example.conf} "$pkgdir/etc/mplayer/"
+
+    install -Dm644 etc/{codecs.conf,input.conf,example.conf} \
+        "$pkgdir/etc/mplayer/"
+
     install -dm755 "$pkgdir/usr/share/mplayer/"
-    ln -s /usr/share/fonts/TTF/DejaVuSans.ttf "$pkgdir/usr/share/mplayer/subfont.ttf"
+    ln -s /usr/share/fonts/TTF/DejaVuSans.ttf \
+        "$pkgdir/usr/share/mplayer/subfont.ttf"
     rm -rf "$pkgdir/usr/share/mplayer/font"
+
     #desktop file  FS#14770
-    install -Dm644 "$srcdir/mplayer.desktop" "$pkgdir/usr/share/applications/mplayer.desktop"
-    install -Dm644 etc/mplayer256x256.png "$pkgdir/usr/share/pixmaps/mplayer.png"
+    install -Dm644 "$srcdir/mplayer.desktop" \
+        "$pkgdir/usr/share/applications/mplayer.desktop"
+    install -Dm644 etc/mplayer256x256.png \
+        "$pkgdir/usr/share/pixmaps/mplayer.png"
 }
 
 package_mencoder-libre() {
     pkgdesc="Free command line video decoding, encoding and filtering tool, without nonfree 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-paranoia' 'libvorbis')
+    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-paranoia'
+        'libvorbis' 'opus'
+        )
     provides=("mencoder=$pkgver")
     replaces=('mencoder')
     conflicts=('mencoder')
 
-    cd "$srcdir/$_pkgbase-$pkgver"
+    cd $_pkgbase-$pkgver
     make DESTDIR="$pkgdir" install-mencoder install-mencoder-man
     find "$pkgdir/usr/share/man" -name mplayer.1 -exec rename mplayer.1 mencoder.1 {} +
 }