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

Conflicts:
	community/arm-elf-binutils/PKGBUILD
	community/bird/PKGBUILD
	community/cantata/PKGBUILD
	community/dbmail/PKGBUILD
	community/ekg2/PKGBUILD
	community/ffmpeg-compat/PKGBUILD
	community/gigedit/PKGBUILD
	community/gimp-refocus/PKGBUILD
	community/gmime24/PKGBUILD
	community/gmpc/PKGBUILD
	community/gnash/PKGBUILD
	community/id3lib-rcc/PKGBUILD
	community/linuxsampler/PKGBUILD
	community/lwm/PKGBUILD
	community/midori/PKGBUILD
	community/mplayer2/PKGBUILD
	community/mtpaint/PKGBUILD
	community/nestopia/PKGBUILD
	community/preload/PKGBUILD
	community/projectm/PKGBUILD
	community/rusxmms/PKGBUILD
	community/taglib-rcc/PKGBUILD
	community/the_silver_searcher/PKGBUILD
	community/xnee/PKGBUILD
	core/libgcrypt/PKGBUILD
	core/libusbx/PKGBUILD
	core/mkinitcpio-busybox/PKGBUILD
	extra/a2ps/PKGBUILD
	extra/a52dec/PKGBUILD
	extra/abook/PKGBUILD
	extra/avidemux/PKGBUILD
	extra/bzflag/PKGBUILD
	extra/cln/PKGBUILD
	extra/exempi/PKGBUILD
	extra/ffmpeg/PKGBUILD
	extra/fluxter/PKGBUILD
	extra/fontforge/PKGBUILD
	extra/glib/PKGBUILD
	extra/gnet/PKGBUILD
	extra/gnome-vfs/PKGBUILD
	extra/gnutls/PKGBUILD
	extra/gstreamer0.10-ugly/PKGBUILD
	extra/gtk/PKGBUILD
	extra/idnkit/PKGBUILD
	extra/ilmbase/PKGBUILD
	extra/imake/PKGBUILD
	extra/kdenetwork/PKGBUILD
	extra/libdatrie/PKGBUILD
	extra/libmbim/PKGBUILD
	extra/libmp3splt/PKGBUILD
	extra/libqmi/PKGBUILD
	extra/libtxc_dxtn/PKGBUILD
	extra/libxfont/PKGBUILD
	extra/mesa/PKGBUILD
	extra/modemmanager/PKGBUILD
	extra/nedit/PKGBUILD
	extra/nmap/PKGBUILD
	extra/openexr/PKGBUILD
	extra/purple-plugin-pack/PKGBUILD
	extra/qemu/PKGBUILD
	extra/qtwebkit/PKGBUILD
	extra/subversion/PKGBUILD
	extra/transmission/PKGBUILD
	extra/truecrypt/PKGBUILD
	extra/vigra/PKGBUILD
	extra/virtuoso/PKGBUILD
	extra/vlc/PKGBUILD
	extra/wireshark/PKGBUILD
	extra/wxmaxima/PKGBUILD
	extra/x264/PKGBUILD
	extra/xorg-iceauth/PKGBUILD
	extra/xorg-mkfontscale/PKGBUILD
	extra/xorg-xfd/PKGBUILD
	libre/abuse-libre/PKGBUILD
	libre/clementine-libre/PKGBUILD
	libre/linux-libre/PKGBUILD

1 files changed, 22 insertions, 15 deletions

diff --git a/extra/vlc/PKGBUILD b/extra/vlc/PKGBUILD
index 2fa15ab4c..b876df205 100644
--- a/extra/vlc/PKGBUILD
+++ b/extra/vlc/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 188100 2013-06-09 13:12:36Z giovanni $
+# $Id: PKGBUILD 191972 2013-08-02 09:52:35Z bpiotrowski $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
 # Contributor: Martin Sandsmark <martin.sandsmark@kde.org>
 
 pkgname=vlc
-pkgver=2.0.7
-pkgrel=2
+pkgver=2.0.8.a
+pkgrel=1
 pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.videolan.org/vlc/"
 license=('LGPL2.1' 'GPL2')
 depends=('a52dec' 'libdvbpsi' 'libxpm' 'libdca' 'qt4' 'libproxy' 
          'sdl_image' 'libdvdnav' 'libtiger' 'lua51' 'libmatroska' 
-         'zvbi' 'taglib' 'libmpcdec' 'ffmpeg' 'faad2' 'libupnp' 
+         'zvbi' 'taglib' 'libmpcdec' 'ffmpeg-compat' 'faad2' 'libupnp' 
          'libshout' 'libmad' 'libmpeg2' 'xcb-util-keysyms')
 makedepends=('live-media' 'libnotify' 'libbluray' 'flac' 'kdelibs'
              'libdc1394' 'libavc1394'
@@ -58,22 +58,29 @@ backup=('usr/share/vlc/lua/http/.hosts'
         'usr/share/vlc/lua/http/dialogs/.hosts')
 options=('!libtool' '!emptydirs')
 install=vlc.install
-source=("http://download.videolan.org/pub/videolan/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.xz")
-md5sums=('3b0e465b0990097b65abaf3e25589957')
+source=("http://download.videolan.org/pub/videolan/${pkgname}/${pkgver/.a}/${pkgname}-${pkgver/.a/a}.tar.xz"
+        vlc-2.0.7-vaapi-compat.patch
+        vlc-2.0.8-Fix-live555-breakage-in-last-update.patch)
+md5sums=('e5000677181406d026ffe448633d1ca0'
+         '6df10774bb7acf20e09d6139e5c7839e'
+         'e592efe7bb65291a84f99cfaa3a9f8a2')
 
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+prepare() {
+  cd "${srcdir}/${pkgname}-${pkgver/.a}"
+
+  patch -Np1 -i ../vlc-2.0.7-vaapi-compat.patch
+  patch -Np1 -i ../vlc-2.0.8-Fix-live555-breakage-in-last-update.patch
 
   sed -i -e 's:truetype/freefont:TTF:g' modules/text_renderer/freetype.c
   sed -i -e 's:truetype/ttf-dejavu:TTF:g' modules/visualization/projectm.cpp
+}
 
-  [ "$CARCH" = "mips64el" ] && extraconf="--disable-lirc"
-
-  # fix for flac-1.3.0
-  sed -i -e 's:stream_decoder.h:FLAC/stream_decoder.h:' modules/codec/flac.c
-  sed -i -e 's:stream_encoder.h:FLAC/stream_encoder.h:' modules/codec/flac.c
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver/.a}"
 
+  [ "$CARCH" = "mips64el" ] && extraconf="--disable-lirc"
   CFLAGS+="-I/usr/include/samba-4.0" CPPFLAGS+="-I/usr/include/samba-4.0" \
+  PKG_CONFIG_PATH+="/usr/lib/ffmpeg-compat/pkgconfig" \
   ./configure --prefix=/usr \
               --sysconfdir=/etc \
               --disable-rpath \
@@ -98,12 +105,12 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "${srcdir}/${pkgname}-${pkgver/.a}"
 
   make DESTDIR="${pkgdir}" install
 
   for res in 16 32 48 128; do
-    install -D -m644 "${srcdir}/vlc-${pkgver}/share/icons/${res}x${res}/vlc.png" \
+    install -D -m644 "${srcdir}/vlc-${pkgver/.a}/share/icons/${res}x${res}/vlc.png" \
         "${pkgdir}/usr/share/icons/hicolor/${res}x${res}/apps/vlc.png"
   done
 }