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

Conflicts:
	community/cdemu-daemon/PKGBUILD
	community/chmsee/PKGBUILD
	community/fceux/PKGBUILD
	community/ginac/PKGBUILD
	community/gstreamermm/PKGBUILD
	community/gtksourceviewmm/PKGBUILD
	community/lgi/PKGBUILD
	community/libmirage/PKGBUILD
	core/gawk/PKGBUILD
	core/gettext/PKGBUILD
	extra/enca/PKGBUILD
	extra/gnutls/PKGBUILD
	extra/hdf5/PKGBUILD
	extra/kdebase/PKGBUILD
	extra/libass/PKGBUILD
	extra/libdiscid/PKGBUILD
	extra/libxcomposite/PKGBUILD
	extra/libxdamage/PKGBUILD
	extra/maxima/PKGBUILD
	extra/nx/PKGBUILD
	extra/opencv/PKGBUILD
	extra/pidgin/PKGBUILD
	extra/redland/PKGBUILD
	extra/sharutils/PKGBUILD
	extra/soundtouch/PKGBUILD
	extra/sqlite/PKGBUILD
	extra/twisted/PKGBUILD
	libre/dpkg/PKGBUILD

3 files changed, 188 insertions, 0 deletions

diff --git a/extra/farstream-0.1/PKGBUILD b/extra/farstream-0.1/PKGBUILD
new file mode 100644
index 000000000..e5b83a282
--- /dev/null
+++ b/extra/farstream-0.1/PKGBUILD
@@ -0,0 +1,44 @@
+# $Id: PKGBUILD 174741 2013-01-05 21:31:32Z foutrelis $
+# Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
+# Contributor: Ionut Biru <ibiru@archlinux.org>
+
+pkgname=farstream-0.1
+_pkgname=farstream
+pkgver=0.1.2
+pkgrel=2
+pkgdesc="Audio/Video Communications Framework (legacy version)"
+arch=('i686' 'x86_64')
+url="http://www.freedesktop.org/wiki/Software/Farstream"
+license=('LGPL2.1')
+depends=('libnice' 'gstreamer0.10-base' 'gstreamer0.10-bad-plugins'
+         'gstreamer0.10-good' 'gstreamer0.10-ffmpeg')
+makedepends=('gobject-introspection' 'gstreamer0.10-python' 'python2-gobject2')
+options=('!libtool')
+source=(http://freedesktop.org/software/$_pkgname/releases/$_pkgname/$_pkgname-$pkgver.tar.gz
+        farstream-0.1.2-prefer-vp8.patch
+        farstream-0.1.2-introspection-tag-order.patch)
+sha256sums=('fa5a40597b47b59d124f7fd57f66704b030d576cdc0d90e107c7a592f05e73d9'
+            '5f8f2876bde0f21383b3d059c94914a2fcd63d45a1bb1b5cd2e2208cd2536da5'
+            'f540ea6f239e291f9ffc5b806cfea9f9cd0c4f13963e900719a5ee3a3f370124')
+
+build() {
+  cd "$_pkgname-$pkgver"
+
+  patch -Np1 -i "$srcdir/farstream-0.1.2-prefer-vp8.patch"
+  patch -Np1 -i "$srcdir/farstream-0.1.2-introspection-tag-order.patch"
+
+  ./configure \
+    --prefix=/usr \
+    --with-package-name='Arch Linux Farstream 0.1 Package' \
+    --with-package-origin='httpw://www.archlinux.org/' \
+    --disable-static
+  make
+}
+
+package() {
+  cd "$_pkgname-$pkgver"
+
+  make DESTDIR="$pkgdir" install
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/extra/farstream-0.1/farstream-0.1.2-introspection-tag-order.patch b/extra/farstream-0.1/farstream-0.1.2-introspection-tag-order.patch
new file mode 100644
index 000000000..3283e1fd2
--- /dev/null
+++ b/extra/farstream-0.1/farstream-0.1.2-introspection-tag-order.patch
@@ -0,0 +1,132 @@
+From 39450457190675716c8e66700e35b05334a6a1a0 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Olivier=20Cr=C3=AAte?= <olivier.crete@collabora.com>
+Date: Fri, 25 May 2012 17:06:59 -0400
+Subject: [PATCH] Gtk-doc tags belong after the description
+
+---
+ farstream/fs-session.c |   16 +++++++---------
+ farstream/fs-stream.c  |   15 ++++++---------
+ 2 files changed, 13 insertions(+), 18 deletions(-)
+
+diff --git a/farstream/fs-session.c b/farstream/fs-session.c
+index 80794d1..abb1bc3 100644
+--- a/farstream/fs-session.c
++++ b/farstream/fs-session.c
+@@ -270,9 +270,6 @@ fs_session_class_init (FsSessionClass *klass)
+   /**
+    * FsSession:codec-preferences:
+    *
+-   * Type: GLib.List(FsCodec)
+-   * Transfer: full
+-   *
+    * This is the current preferences list for the local codecs. It is
+    * set by the user to specify the codec options and priorities. The user may
+    * change its value with fs_session_set_codec_preferences() at any time
+@@ -283,6 +280,9 @@ fs_session_class_init (FsSessionClass *klass)
+    * or %FS_CODEC_ID_ANY. If the encoding name is "reserve-pt", then the
+    * payload type of the codec will be "reserved" and not be used by any
+    * dynamically assigned payload type.
++   *
++   * Type: GLib.List(FsCodec)
++   * Transfer: full
+    */
+   g_object_class_install_property (gobject_class,
+       PROP_CODEC_PREFERENCES,
+@@ -296,9 +296,6 @@ fs_session_class_init (FsSessionClass *klass)
+   /**
+    * FsSession:codecs:
+    *
+-   * Type: GLib.List(FsCodec)
+-   * Transfer: full
+-   *
+    * This is the list of codecs used for this session. It will include the
+    * codecs and payload type used to receive media on this session. It will
+    * also include any configuration parameter that must be transmitted reliably
+@@ -317,6 +314,8 @@ fs_session_class_init (FsSessionClass *klass)
+    * It is a #GList of #FsCodec. User must free this codec list using
+    * fs_codec_list_destroy() when done.
+    *
++   * Type: GLib.List(FsCodec)
++   * Transfer: full
+    */
+   g_object_class_install_property (gobject_class,
+       PROP_CODECS,
+@@ -329,9 +328,6 @@ fs_session_class_init (FsSessionClass *klass)
+   /**
+    * FsSession:codecs-without-config:
+    *
+-   * Type: GLib.List(FsCodec)
+-   * Transfer: full
+-   *
+    * This is the same list of codecs as #FsSession:codecs without
+    * the configuration information that describes the data sent. It is suitable
+    * for configurations where a list of codecs is shared by many senders.
+@@ -349,6 +345,8 @@ fs_session_class_init (FsSessionClass *klass)
+    * It is a #GList of #FsCodec. User must free this codec list using
+    * fs_codec_list_destroy() when done.
+    *
++   * Type: GLib.List(FsCodec)
++   * Transfer: full
+    */
+   g_object_class_install_property (gobject_class,
+       PROP_CODECS_WITHOUT_CONFIG,
+diff --git a/farstream/fs-stream.c b/farstream/fs-stream.c
+index b9e1320..110641d 100644
+--- a/farstream/fs-stream.c
++++ b/farstream/fs-stream.c
+@@ -176,13 +176,12 @@ fs_stream_class_init (FsStreamClass *klass)
+   /**
+    * FsStream:remote-codecs:
+    *
+-   * Type: GLib.List(FsCodec)
+-   * Transfer: full
+-   *
+    * This is the list of remote codecs for this stream. They must be set by the
+    * user as soon as they are known using fs_stream_set_remote_codecs()
+    * (generally through external signaling). It is a #GList of #FsCodec.
+    *
++   * Type: GLib.List(FsCodec)
++   * Transfer: full
+    */
+   g_object_class_install_property (gobject_class,
+       PROP_REMOTE_CODECS,
+@@ -195,15 +194,14 @@ fs_stream_class_init (FsStreamClass *klass)
+   /**
+    * FsStream:negotiated-codecs:
+    *
+-   * Type: GLib.List(FsCodec)
+-   * Transfer: full
+-   *
+    * This is the list of negotiatied codecs, it is the same list as the list
+    * of #FsCodec from the parent #FsSession, except that the codec config data
+    * has been replaced with the data from the remote codecs for this stream.
+    * This is the list of #FsCodec used to receive data from this stream.
+    * It is a #GList of #FsCodec.
+    *
++   * Type: GLib.List(FsCodec)
++   * Transfer: full
+    */
+   g_object_class_install_property (gobject_class,
+       PROP_NEGOTIATED_CODECS,
+@@ -216,9 +214,6 @@ fs_stream_class_init (FsStreamClass *klass)
+   /**
+    * FsStream:current-recv-codecs:
+    *
+-   * Type: GLib.List(FsCodec)
+-   * Transfer: full
+-   *
+    * This is the list of codecs that have been received by this stream.
+    * The user must free the list if fs_codec_list_destroy().
+    * The "farstream-recv-codecs-changed" message is send on the #GstBus
+@@ -228,6 +223,8 @@ fs_stream_class_init (FsStreamClass *klass)
+    * also be emitted if the pad already exists, but the source material that
+    * will come to it is different.
+    *
++   * Type: GLib.List(FsCodec)
++   * Transfer: full
+    */
+   g_object_class_install_property (gobject_class,
+       PROP_CURRENT_RECV_CODECS,
+-- 
+1.7.8.6
+
diff --git a/extra/farstream-0.1/farstream-0.1.2-prefer-vp8.patch b/extra/farstream-0.1/farstream-0.1.2-prefer-vp8.patch
new file mode 100644
index 000000000..67009a8ad
--- /dev/null
+++ b/extra/farstream-0.1/farstream-0.1.2-prefer-vp8.patch
@@ -0,0 +1,12 @@
+diff -urNp farstream-0.1.1.orig/gst/fsrtpconference/default-codec-preferences farstream-0.1.1/gst/fsrtpconference/default-codec-preferences
+--- farstream-0.1.1.orig/gst/fsrtpconference/default-codec-preferences	2012-03-20 12:12:22.644324485 +0100
++++ farstream-0.1.1/gst/fsrtpconference/default-codec-preferences	2012-03-21 09:32:04.468634455 +0100
+@@ -41,6 +41,8 @@ feedback:nack/pli=
+ [video/H263]
+ feedback:nack/pli=
+ 
++[video/VP8-DRAFT-IETF-01]
++
+ [video/THEORA]
+ #feedback:tfrc=
+ feedback:nack/pli=