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

Conflicts:
	community/percona-server/PKGBUILD
	community/xmlrpc-c/PKGBUILD
	core/util-linux/PKGBUILD
	extra/colord/PKGBUILD
	extra/epiphany/PKGBUILD
	extra/evolution-data-server/PKGBUILD
	extra/evolution/PKGBUILD
	extra/gcr/PKGBUILD
	extra/gdm/PKGBUILD
	extra/gnome-color-manager/PKGBUILD
	extra/gnome-control-center/PKGBUILD
	extra/gnome-dictionary/PKGBUILD
	extra/gnome-font-viewer/PKGBUILD
	extra/gnome-screenshot/PKGBUILD
	extra/gnome-search-tool/PKGBUILD
	extra/gnome-system-log/PKGBUILD
	extra/gobject-introspection/PKGBUILD
	extra/grilo/PKGBUILD
	extra/gtkmm3/PKGBUILD
	extra/gvfs/PKGBUILD
	extra/json-glib/PKGBUILD
	extra/libgnome-keyring/PKGBUILD
	extra/nautilus-open-terminal/PKGBUILD
	extra/pidgin/PKGBUILD
	extra/pygobject/PKGBUILD
	extra/rest/PKGBUILD
	extra/rhythmbox/PKGBUILD
	extra/seahorse/PKGBUILD
	extra/totem/PKGBUILD
	extra/xorg-xinit/PKGBUILD
	extra/yelp/PKGBUILD

2 files changed, 44 insertions, 42 deletions

diff --git a/extra/opal/PKGBUILD b/extra/opal/PKGBUILD
index 1ab9defb5..afc56caca 100644
--- a/extra/opal/PKGBUILD
+++ b/extra/opal/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 163159 2012-07-08 09:32:20Z ibiru $
+# $Id: PKGBUILD 169994 2012-10-30 23:01:05Z heftig $
 # Maintainer: Jan de Groot <jan@archlinux.org>
 # Contributor: Tom K <tomk@runbox.com>
 pkgname=opal
-pkgver=3.10.5
-pkgrel=1
+pkgver=3.10.7
+pkgrel=2
 pkgdesc="Open Phone Abstraction Library"
 arch=(i686 x86_64 'mips64el')
 url="http://www.opalvoip.org"
@@ -13,7 +13,8 @@ makedepends=('ffmpeg')
 options=(!makeflags)
 source=(http://downloads.sourceforge.net/sourceforge/opalvoip/$pkgname-$pkgver.tar.bz2
         opal-ffmpeg.patch)
-md5sums=('22b0d716ed1cbc935245539e0bbab38f' '53bb06a376fb57a306522bfa6a573217')
+md5sums=('8686bb930668067eefadab115d2ee1c2'
+         '0f05c01dada644b37805667ba9e81aa5')
 
 build() {
   cd "${srcdir}/opal-${pkgver}"
diff --git a/extra/opal/opal-ffmpeg.patch b/extra/opal/opal-ffmpeg.patch
index ebfd1f037..c40e1ddfb 100644
--- a/extra/opal/opal-ffmpeg.patch
+++ b/extra/opal/opal-ffmpeg.patch
@@ -1,7 +1,7 @@
-diff -ru opal-3.10.5/plugins/video/H.263-1998/h263-1998.cxx opal-3.10.5.patched/plugins/video/H.263-1998/h263-1998.cxx
---- opal-3.10.5/plugins/video/H.263-1998/h263-1998.cxx	2012-04-26 06:56:01.000000000 +0200
-+++ opal-3.10.5.patched/plugins/video/H.263-1998/h263-1998.cxx	2012-06-10 16:39:35.447021150 +0200
-@@ -51,6 +51,7 @@
+diff -ru opal-3.10.7/plugins/video/H.263-1998/h263-1998.cxx opal-3.10.7.patched/plugins/video/H.263-1998/h263-1998.cxx
+--- opal-3.10.7/plugins/video/H.263-1998/h263-1998.cxx	2012-08-23 04:18:42.000000000 +0200
++++ opal-3.10.7.patched/plugins/video/H.263-1998/h263-1998.cxx	2012-08-28 19:53:12.080918973 +0200
+@@ -48,6 +48,7 @@
  #endif
  
  #include "h263-1998.h"
@@ -9,7 +9,7 @@ diff -ru opal-3.10.5/plugins/video/H.263-1998/h263-1998.cxx opal-3.10.5.patched/
  #include <limits>
  #include <iomanip>
  #include <stdio.h>
-@@ -324,9 +325,9 @@
+@@ -317,9 +318,9 @@
      // Level 2+ 
      // works with eyeBeam, signaled via  non-standard "D"
      if (atoi(value) == 1)
@@ -21,7 +21,7 @@ diff -ru opal-3.10.5/plugins/video/H.263-1998/h263-1998.cxx opal-3.10.5.patched/
      return;
    }
  
-@@ -335,9 +336,9 @@
+@@ -328,9 +329,9 @@
      // Annex F: Advanced Prediction Mode
      // does not work with eyeBeam
      if (atoi(value) == 1)
@@ -33,7 +33,7 @@ diff -ru opal-3.10.5/plugins/video/H.263-1998/h263-1998.cxx opal-3.10.5.patched/
      return;
    }
  #endif
-@@ -367,9 +368,9 @@
+@@ -360,9 +361,9 @@
      // Annex K: Slice Structure
      // does not work with eyeBeam
      if (atoi(value) != 0)
@@ -45,7 +45,7 @@ diff -ru opal-3.10.5/plugins/video/H.263-1998/h263-1998.cxx opal-3.10.5.patched/
      return;
    }
  
-@@ -377,9 +378,9 @@
+@@ -370,9 +371,9 @@
      // Annex S: Alternative INTER VLC mode
      // does not work with eyeBeam
      if (atoi(value) == 1)
@@ -56,8 +56,8 @@ diff -ru opal-3.10.5/plugins/video/H.263-1998/h263-1998.cxx opal-3.10.5.patched/
 +      av_opt_set_int(m_context->priv_data, "aiv", 0, 0);
      return;
    }
- }
-@@ -445,15 +446,6 @@
+ 
+@@ -450,15 +451,6 @@
    PTRACE(5, m_prefix, "qmax set to " << m_context->qmax);
    PTRACE(5, m_prefix, "payload size set to " << m_context->rtp_payload_size);
  
@@ -73,7 +73,7 @@ diff -ru opal-3.10.5/plugins/video/H.263-1998/h263-1998.cxx opal-3.10.5.patched/
    return FFMPEGLibraryInstance.AvcodecOpen(m_context, m_codec) == 0;
  }
  
-@@ -516,7 +508,7 @@
+@@ -521,7 +513,7 @@
  
      // Need to copy to local buffer to guarantee 16 byte alignment
      memcpy(m_inputFrame->data[0], OPAL_VIDEO_FRAME_DATA_PTR(header), header->width*header->height*3/2);
@@ -82,7 +82,7 @@ diff -ru opal-3.10.5/plugins/video/H.263-1998/h263-1998.cxx opal-3.10.5.patched/
  
      /*
      m_inputFrame->pts = (int64_t)srcRTP.GetTimestamp()*m_context->time_base.den/m_context->time_base.num/VIDEO_CLOCKRATE;
-@@ -598,13 +590,13 @@
+@@ -603,13 +595,13 @@
    m_context->rtp_callback = &H263_RFC2190_EncoderContext::RTPCallBack;
    m_context->opaque = this; // used to separate out packets from different encode threads
  
@@ -99,21 +99,23 @@ diff -ru opal-3.10.5/plugins/video/H.263-1998/h263-1998.cxx opal-3.10.5.patched/
  
    return true;
  }
-diff -ru opal-3.10.5/plugins/video/H.264/gpl/h264_helper.cxx opal-3.10.5.patched/plugins/video/H.264/gpl/h264_helper.cxx
---- opal-3.10.5/plugins/video/H.264/gpl/h264_helper.cxx	2012-04-26 06:56:00.000000000 +0200
-+++ opal-3.10.5.patched/plugins/video/H.264/gpl/h264_helper.cxx	2012-06-10 16:49:11.210568639 +0200
-@@ -25,6 +25,7 @@
+Only in opal-3.10.7.patched/plugins/video/H.263-1998: h263-1998.cxx.orig
+diff -ru opal-3.10.7/plugins/video/H.264/gpl/h264_helper.cxx opal-3.10.7.patched/plugins/video/H.264/gpl/h264_helper.cxx
+--- opal-3.10.7/plugins/video/H.264/gpl/h264_helper.cxx	2012-08-23 04:18:41.000000000 +0200
++++ opal-3.10.7.patched/plugins/video/H.264/gpl/h264_helper.cxx	2012-08-28 19:53:12.080918973 +0200
+@@ -27,6 +27,7 @@
  #include <fstream>
  #include <stdlib.h> 
  #include <sys/stat.h>
 +#include <unistd.h>
  
- 
- #ifndef PLUGINCODEC_TRACING
-diff -ru opal-3.10.5/plugins/video/H.264/h264-x264.cxx opal-3.10.5.patched/plugins/video/H.264/h264-x264.cxx
---- opal-3.10.5/plugins/video/H.264/h264-x264.cxx	2012-04-26 06:56:00.000000000 +0200
-+++ opal-3.10.5.patched/plugins/video/H.264/h264-x264.cxx	2012-06-10 17:04:19.695646950 +0200
-@@ -1035,13 +1035,10 @@
+ #ifdef HAVE_UNISTD_H
+ #include <unistd.h>
+Only in opal-3.10.7.patched/plugins/video/H.264/gpl: h264_helper.cxx.orig
+diff -ru opal-3.10.7/plugins/video/H.264/h264-x264.cxx opal-3.10.7.patched/plugins/video/H.264/h264-x264.cxx
+--- opal-3.10.7/plugins/video/H.264/h264-x264.cxx	2012-08-23 04:18:41.000000000 +0200
++++ opal-3.10.7.patched/plugins/video/H.264/h264-x264.cxx	2012-08-28 19:53:12.080918973 +0200
+@@ -1071,13 +1071,10 @@
          return false;
  
        m_context->workaround_bugs = FF_BUG_AUTODETECT;
@@ -128,32 +130,31 @@ diff -ru opal-3.10.5/plugins/video/H.264/h264-x264.cxx opal-3.10.5.patched/plugi
                            CODEC_FLAG2_SKIP_RD |
                            CODEC_FLAG2_CHUNKS;
  
-diff -ru opal-3.10.5/plugins/video/H.264/shared/x264wrap.cxx opal-3.10.5.patched/plugins/video/H.264/shared/x264wrap.cxx
---- opal-3.10.5/plugins/video/H.264/shared/x264wrap.cxx	2012-04-26 06:56:00.000000000 +0200
-+++ opal-3.10.5.patched/plugins/video/H.264/shared/x264wrap.cxx	2012-06-10 17:04:46.012171051 +0200
+Only in opal-3.10.7.patched/plugins/video/H.264: h264-x264.cxx.orig
+diff -ru opal-3.10.7/plugins/video/H.264/shared/x264wrap.cxx opal-3.10.7.patched/plugins/video/H.264/shared/x264wrap.cxx
+--- opal-3.10.7/plugins/video/H.264/shared/x264wrap.cxx	2012-08-23 04:18:41.000000000 +0200
++++ opal-3.10.7.patched/plugins/video/H.264/shared/x264wrap.cxx	2012-08-28 19:53:12.084252306 +0200
 @@ -33,6 +33,7 @@
  
  #include <codec/opalplugin.hpp>
  #include <stdio.h>
 +#include <unistd.h>
  
+ #ifdef HAVE_UNISTD_H
+ #include <unistd.h>
+Only in opal-3.10.7.patched/plugins/video/H.264/shared: x264wrap.cxx.orig
+diff -ru opal-3.10.7/plugins/video/MPEG4-ffmpeg/mpeg4.cxx opal-3.10.7.patched/plugins/video/MPEG4-ffmpeg/mpeg4.cxx
+--- opal-3.10.7/plugins/video/MPEG4-ffmpeg/mpeg4.cxx	2012-08-23 04:18:44.000000000 +0200
++++ opal-3.10.7.patched/plugins/video/MPEG4-ffmpeg/mpeg4.cxx	2012-08-28 19:54:35.460923804 +0200
+@@ -103,6 +103,7 @@
  
- #if defined(X264_LICENSED) || defined(GPL_HELPER_APP)
-diff -ru opal-3.10.5/plugins/video/MPEG4-ffmpeg/mpeg4.cxx opal-3.10.5.patched/plugins/video/MPEG4-ffmpeg/mpeg4.cxx
---- opal-3.10.5/plugins/video/MPEG4-ffmpeg/mpeg4.cxx	2012-04-26 06:56:02.000000000 +0200
-+++ opal-3.10.5.patched/plugins/video/MPEG4-ffmpeg/mpeg4.cxx	2012-06-10 16:46:33.498089705 +0200
-@@ -101,8 +101,10 @@
- #include <libavutil/bswap.h>
- #include <libavcodec/mpegvideo.h>
- 
-+
  #else /* LIBAVCODEC_HAVE_SOURCE_DIR */
- #include LIBAVCODEC_HEADER
+ #include "../common/ffmpeg.h"
 +#include <libavutil/opt.h>
  #endif /* LIBAVCODEC_HAVE_SOURCE_DIR */
  }
  
-@@ -589,17 +591,17 @@
+@@ -589,17 +590,17 @@
      m_avpicture->quality = m_videoQMin;
  
  #ifdef USE_ORIG
@@ -174,7 +175,7 @@ diff -ru opal-3.10.5/plugins/video/MPEG4-ffmpeg/mpeg4.cxx opal-3.10.5.patched/pl
  #endif
      m_avcontext->opaque = this;              // for use in RTP callback
  }
-@@ -804,7 +806,7 @@
+@@ -804,7 +805,7 @@
          // Should the next frame be an I-Frame?
          if ((flags & PluginCodec_CoderForceIFrame) || (m_frameNum == 0))
          {
@@ -183,7 +184,7 @@ diff -ru opal-3.10.5/plugins/video/MPEG4-ffmpeg/mpeg4.cxx opal-3.10.5.patched/pl
          }
          else // No IFrame requested, let avcodec decide what to do
          {
-@@ -1325,7 +1327,7 @@
+@@ -1325,7 +1326,7 @@
  
  void MPEG4DecoderContext::SetStaticDecodingParams() {
      m_avcontext->flags |= CODEC_FLAG_4MV;