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

Conflicts:
	community/abe/PKGBUILD
	community/account-plugins/PKGBUILD
	community/adesklets/PKGBUILD
	community/aircrack-ng/PKGBUILD
	community/audit/PKGBUILD
	community/bchunk/PKGBUILD
	community/bibutils/PKGBUILD
	community/cantata/PKGBUILD
	community/cdck/PKGBUILD
	community/cinnamon-control-center/PKGBUILD
	community/clusterssh/PKGBUILD
	community/consonance/PKGBUILD
	community/credentials-preferences/PKGBUILD
	community/dee/PKGBUILD
	community/dosbox/PKGBUILD
	community/drbd/PKGBUILD
	community/dvdisaster/PKGBUILD
	community/ekg/PKGBUILD
	community/ekg2/PKGBUILD
	community/emelfm2/PKGBUILD
	community/erlang/PKGBUILD
	community/ettercap/PKGBUILD
	community/evilwm/PKGBUILD
	community/fatrat/PKGBUILD
	community/fcitx-mozc/PKGBUILD
	community/fcrackzip/PKGBUILD
	community/ffmpegsource/PKGBUILD
	community/fssos-nsvs/PKGBUILD
	community/geda-gaf/PKGBUILD
	community/gnome-applets/PKGBUILD
	community/gnome-panel/PKGBUILD
	community/gnustep-make/PKGBUILD
	community/gwibber/PKGBUILD
	community/html2text/PKGBUILD
	community/intellij-idea-libs/PKGBUILD
	community/libcgns2/PKGBUILD
	community/libmatio/PKGBUILD
	community/librcc/PKGBUILD
	community/libsignon-glib/PKGBUILD
	community/linux-tools/PKGBUILD
	community/minitube/PKGBUILD
	community/mpdscribble/PKGBUILD
	community/mplayer2/PKGBUILD
	community/musepack-tools/PKGBUILD
	community/nginx/PKGBUILD
	community/pam_pwcheck/PKGBUILD
	community/portaudio/PKGBUILD
	community/portaudio_cpp/PKGBUILD
	community/prelink/PKGBUILD
	community/projectm/PKGBUILD
	community/prosody/PKGBUILD
	community/python-basemap/PKGBUILD
	community/qgit/PKGBUILD
	community/raptor1/PKGBUILD
	community/sensors-applet/PKGBUILD
	community/signon-keyring-extension/PKGBUILD
	community/signon-plugin-oauth2/PKGBUILD
	community/signon-ui/PKGBUILD
	community/sshguard/PKGBUILD
	community/tea/PKGBUILD
	community/tint2/PKGBUILD
	community/tremulous/PKGBUILD
	community/vobcopy/PKGBUILD
	community/windowlab/PKGBUILD
	community/xdelta/PKGBUILD
	community/xmms2/PKGBUILD
	community/xosd/PKGBUILD
	core/gdbm/PKGBUILD
	core/heirloom-mailx/PKGBUILD
	core/libffi/PKGBUILD
	core/procps-ng/PKGBUILD
	core/systemd/PKGBUILD
	core/tar/PKGBUILD
	cross/mips64el-unknown-linux-gnu-linux-libre-api-headers/PKGBUILD
	extra/arj/PKGBUILD
	extra/audacity/PKGBUILD
	extra/cdparanoia/PKGBUILD
	extra/elfutils/PKGBUILD
	extra/fltk/PKGBUILD
	extra/gnome-python-desktop/PKGBUILD
	extra/gstreamer/PKGBUILD
	extra/gtk2/PKGBUILD
	extra/gvfs/PKGBUILD
	extra/imagemagick/PKGBUILD
	extra/indent/PKGBUILD
	extra/kdepim/PKGBUILD
	extra/lcms/PKGBUILD
	extra/lesstif/PKGBUILD
	extra/libchewing/PKGBUILD
	extra/libdrm/PKGBUILD
	extra/libmodplug/PKGBUILD
	extra/libnotify/PKGBUILD
	extra/libsm/PKGBUILD
	extra/libxmu/PKGBUILD
	extra/libxpm/PKGBUILD
	extra/mariadb/PKGBUILD
	extra/mesa/PKGBUILD
	extra/mkvtoolnix/PKGBUILD
	extra/neon/PKGBUILD
	extra/ocaml/PKGBUILD
	extra/phonon-vlc/PKGBUILD
	extra/php-xcache/PKGBUILD
	extra/polkit/PKGBUILD
	extra/pycups/PKGBUILD
	extra/python-cairo/PKGBUILD
	extra/python/PKGBUILD
	extra/ruby/PKGBUILD
	extra/sqlite/PKGBUILD
	extra/talloc/PKGBUILD
	extra/thunar-archive-plugin/PKGBUILD
	extra/totem-plparser/PKGBUILD
	extra/totem/PKGBUILD
	extra/vinagre/PKGBUILD
	extra/vino/PKGBUILD
	extra/vlc/PKGBUILD
	extra/wget/PKGBUILD
	extra/xine-lib/PKGBUILD
	extra/xorg-server/PKGBUILD
	extra/xorg-twm/PKGBUILD
	extra/xorg-xclipboard/PKGBUILD
	extra/xorg-xclock/PKGBUILD
	extra/xorg-xkill/PKGBUILD
	extra/xorg-xlsclients/PKGBUILD
	extra/xorg-xman/PKGBUILD
	extra/xorg-xrdb/PKGBUILD
	extra/xpdf/PKGBUILD
	extra/xvidcore/PKGBUILD
	extra/yelp/PKGBUILD
	libre/audacious-plugins-libre/PKGBUILD
	libre/mc-libre/PKGBUILD
	libre/python2-reportlab-libre/PKGBUILD

2 files changed, 7 insertions, 146 deletions

diff --git a/extra/xine-lib/PKGBUILD b/extra/xine-lib/PKGBUILD
index 0113942b9..06d6f5e50 100644
--- a/extra/xine-lib/PKGBUILD
+++ b/extra/xine-lib/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 193690 2013-08-28 00:06:11Z eric $
+# $Id: PKGBUILD 195056 2013-09-24 20:09:11Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=xine-lib
-pkgver=1.2.3
-pkgrel=4
+pkgver=1.2.4
+pkgrel=1
 pkgdesc="A multimedia playback engine"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.xine-project.org"
@@ -28,16 +28,12 @@ optdepends+=('wavpack: for using the wavpack plugin' \
             'libmpcdec: for using the musepack plugin' \
             'libcaca: for using the caca plugin' \
             'libbluray: for using the bluray plugin' \
-            'gnome-vfs: for using the gnome-vfs plugin')
+            'gnome-vfs: for using the gnome-vfs plugin'
+            'smbclient: for using the samba plugin')
 [ "$CARCH" = "mips64el" ] || optdepends+=('libvdpau: for using the VDPAU plugin')
 options=('!libtool')
-source=(http://downloads.sourceforge.net/sourceforge/xine/${pkgname}-${pkgver}.tar.xz accel_vaapi.h)
-sha1sums=('6f9ef4ba75688659052d21448d46527db2b77e57'
-          '08ed9947ef919c71c87151baa8fc0ce7d8f72050')
-
-prepare() {
-  cp accel_vaapi.h ${pkgname}-${pkgver}/src/xine-engine/
-}
+source=(http://downloads.sourceforge.net/sourceforge/xine/${pkgname}-${pkgver}.tar.xz)
+sha1sums=('32267c5fcaa1439a5fbf7606d27dc4fafba9e504')
 
 build() {
   cd ${pkgname}-${pkgver}
diff --git a/extra/xine-lib/accel_vaapi.h b/extra/xine-lib/accel_vaapi.h
deleted file mode 100644
index 666b23fd6..000000000
--- a/extra/xine-lib/accel_vaapi.h
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- * Copyright (C) 2008 the xine project
- *
- * This file is part of xine, a free video player.
- *
- * xine is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * xine is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
- *
- *
- * Common acceleration definitions for vdpau
- *
- *
- */
-
-#ifndef HAVE_XINE_ACCEL_VAAPI_H
-#define HAVE_XINE_ACCEL_VAAPI_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <va/va_x11.h>
-#include <pthread.h>
-#ifdef HAVE_FFMPEG_AVUTIL_H
-#  include <avcodec.h>
-#else
-#  include <libavcodec/avcodec.h>
-#endif
-
-#if LIBAVCODEC_VERSION_MAJOR >= 53 || (LIBAVCODEC_VERSION_MAJOR == 52 && LIBAVCODEC_VERSION_MINOR >= 32)
-#  define AVVIDEO 2
-#else
-#  define AVVIDEO 1
-#  define pp_context	pp_context_t
-#  define pp_mode	pp_mode_t
-#endif
-
-#define NUM_OUTPUT_SURFACES 22
-
-#define SURFACE_FREE            0
-#define SURFACE_ALOC            1
-#define SURFACE_RELEASE         2
-#define SURFACE_RENDER          3
-#define SURFACE_RENDER_RELEASE  5
-
-struct vaapi_equalizer {
-  VADisplayAttribute brightness;
-  VADisplayAttribute contrast;
-  VADisplayAttribute hue;
-  VADisplayAttribute saturation;
-};
-
-typedef struct ff_vaapi_context_s ff_vaapi_context_t;
-
-struct ff_vaapi_context_s {
-  VADisplay         va_display;
-  VAContextID       va_context_id;
-  VAConfigID        va_config_id;
-  int               width;
-  int               height;
-  int               sw_width;
-  int               sw_height;
-  int               va_profile;
-  unsigned int      va_colorspace;
-  VAImage           va_subpic_image;
-  VASubpictureID    va_subpic_id;
-  int               va_subpic_width;
-  int               va_subpic_height;
-  int               is_bound;
-  void              *gl_surface;
-  unsigned int      soft_head;
-  unsigned int      valid_context;
-  unsigned int      va_head;
-  unsigned int      va_soft_head;
-  vo_driver_t       *driver;
-  unsigned int      last_sub_image_fmt;
-  VASurfaceID       last_sub_surface_id;
-  struct vaapi_equalizer va_equalizer;
-  VAImageFormat     *va_image_formats;
-  int               va_num_image_formats;
-  VAImageFormat     *va_subpic_formats;
-  int               va_num_subpic_formats;
-};
-
-typedef struct ff_vaapi_surface_s ff_vaapi_surface_t;
-typedef struct vaapi_accel_s vaapi_accel_t;
-
-struct ff_vaapi_surface_s {
-  unsigned int        index;
-  vaapi_accel_t       *accel;
-  VASurfaceID         va_surface_id;
-  unsigned int        status;
-};
-
-struct vaapi_accel_s {
-  unsigned int        index;
-  vo_frame_t          *vo_frame;
-
-#if AVVIDEO > 1
-  int (*avcodec_decode_video2)(vo_frame_t *frame_gen, AVCodecContext *avctx, AVFrame *picture,
-                               int *got_picture_ptr, AVPacket *avpkt);
-#else
-  int (*avcodec_decode_video)(vo_frame_t *frame_gen, AVCodecContext *avctx, AVFrame *picture,
-                              int *got_picture_ptr, uint8_t *buf, int buf_size);
-#endif
-  VAStatus (*vaapi_init)(vo_frame_t *frame_gen, int va_profile, int width, int height, int softrender);
-  int (*profile_from_imgfmt)(vo_frame_t *frame_gen, enum PixelFormat pix_fmt, int codec_id, int vaapi_mpeg_sofdec);
-  ff_vaapi_context_t *(*get_context)(vo_frame_t *frame_gen);
-  int (*guarded_render)(vo_frame_t *frame_gen);
-  ff_vaapi_surface_t *(*get_vaapi_surface)(vo_frame_t *frame_gen);
-  void (*render_vaapi_surface)(vo_frame_t *frame_gen, ff_vaapi_surface_t *va_surface);
-  void (*release_vaapi_surface)(vo_frame_t *frame_gen, ff_vaapi_surface_t *va_surface);
-};
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-