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

Conflicts:
	community/bitcoin/PKGBUILD
	community/canorus/PKGBUILD
	community/celt-0.7/PKGBUILD
	community/djview4/PKGBUILD
	community/erlang-sdl/PKGBUILD
	community/erlang/PKGBUILD
	community/fcitx-mozc/PKGBUILD
	community/glitz/PKGBUILD
	community/gmerlin/PKGBUILD
	community/gmic/PKGBUILD
	community/goldendict/PKGBUILD
	community/google-gadgets/PKGBUILD
	community/highlight/PKGBUILD
	community/jack2/PKGBUILD
	community/kvirc/PKGBUILD
	community/launchy/PKGBUILD
	community/mplayer2/PKGBUILD
	community/mumble/PKGBUILD
	community/mupdf/PKGBUILD
	community/projectm/PKGBUILD
	community/psimedia/PKGBUILD
	community/pyqt3/PKGBUILD
	community/qps/PKGBUILD
	community/qstardict/PKGBUILD
	community/qsynergy/PKGBUILD
	community/synergy/PKGBUILD
	community/units/PKGBUILD
	community/yagf/PKGBUILD
	extra/automoc4/PKGBUILD
	extra/avahi/PKGBUILD
	extra/avidemux/PKGBUILD
	extra/bzflag/PKGBUILD
	extra/cagibi/PKGBUILD
	extra/cairo/PKGBUILD
	extra/calligra/PKGBUILD
	extra/cmake/PKGBUILD
	extra/dssi/PKGBUILD
	extra/ffmpeg/PKGBUILD
	extra/glu/PKGBUILD
	extra/graphviz/PKGBUILD
	extra/hylafax/PKGBUILD
	extra/kdesdk/PKGBUILD
	extra/libbluedevil/PKGBUILD
	extra/liblastfm/PKGBUILD
	extra/liborigin2/PKGBUILD
	extra/libpng/PKGBUILD
	extra/libqzeitgeist/PKGBUILD
	extra/libx11/PKGBUILD
	extra/mesa/PKGBUILD
	extra/mpg123/PKGBUILD
	extra/mtr/PKGBUILD
	extra/mysql/PKGBUILD
	extra/netpbm/PKGBUILD
	extra/nspr/PKGBUILD
	extra/polkit-qt/PKGBUILD
	extra/poppler/PKGBUILD
	extra/prison/PKGBUILD
	extra/pyqt/PKGBUILD
	extra/qimageblitz/PKGBUILD
	extra/qscintilla/PKGBUILD
	extra/qsynth/PKGBUILD
	extra/qt-assistant-compat/PKGBUILD
	extra/qt-gstreamer/PKGBUILD
	extra/qt/PKGBUILD
	extra/qtwebkit/PKGBUILD
	extra/qwt/PKGBUILD
	extra/samba/PKGBUILD
	extra/sane/PKGBUILD
	extra/smplayer/PKGBUILD
	extra/soprano/PKGBUILD
	extra/texmacs/PKGBUILD
	extra/tomcat-native/PKGBUILD
	extra/transmission/PKGBUILD
	extra/wpa_supplicant_gui/PKGBUILD
	libre/lame-libre/PKGBUILD
	libre/linux-libre/PKGBUILD
	libre/mesa-demos-libre/PKGBUILD

2 files changed, 5 insertions, 35 deletions

diff --git a/extra/ffmpeg/PKGBUILD b/extra/ffmpeg/PKGBUILD
index 7eed96c2c..209ced37e 100644
--- a/extra/ffmpeg/PKGBUILD
+++ b/extra/ffmpeg/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 178409 2013-02-21 12:49:48Z ioni $
+# $Id: PKGBUILD 178756 2013-02-26 18:03:18Z ioni $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 # Contributor: Paul Mattal <paul@archlinux.org>
 
 pkgname=ffmpeg
-pkgver=1.1.2
-pkgrel=3
+pkgver=1.1.3
+pkgrel=1
 epoch=1
 pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix"
 arch=('i686' 'x86_64' 'mips64el')
@@ -21,17 +21,13 @@ if [ "${CARCH}" != "mips64el" ]; then
     depends+=('libva')
     makedepends=('yasm' 'libvdpau')
 fi
-source=(http://ffmpeg.org/releases/$pkgname-$pkgver.tar.bz2
-        h264-vdpau.patch)
-sha256sums=('dc91e4a2499b05740cfddc2b679694e5c0f2ca20c94191de82d7eb200e8c48ce'
-            'f55f31a40627ac375fa903c958f34af0f4c72dd9f64dd5f4f64320bb6f126f42')
+source=(http://ffmpeg.org/releases/$pkgname-$pkgver.tar.bz2)
+sha256sums=('a70057eba6256fab7342f863e7bb556d14cbed207b5b5b884a0879d3f16ca0a8')
 
 build() {
   cd $pkgname-$pkgver
 
   if [ "$CARCH" = "mips64el" ] ; then
-# Make video decoding faster and turn all pixels green.
-#      patch -Np1 -i $srcdir/ffmpeg-loongson.patch
       # Disable runtime CPU detection, video acceleration APIs our hardware doesn't support and ISAs our CPUs don't support.
       extraconf="--disable-runtime-cpudetect --disable-vdpau --disable-vaapi --disable-mips32r2 --disable-mipsdspr1 --disable-mipsdspr2"
   else
diff --git a/extra/ffmpeg/h264-vdpau.patch b/extra/ffmpeg/h264-vdpau.patch
deleted file mode 100644
index 75ebe306f..000000000
--- a/extra/ffmpeg/h264-vdpau.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-X-Git-Url: http://git.videolan.org/?p=ffmpeg.git;a=blobdiff_plain;f=libavcodec%2Fh264.c;h=da749a241d5647751cb5a961429abb6657a79a00;hp=56ef1092bd4509697f11b76ae97757bbc03aef14;hb=c6f59b95c529baf2ea6729ab9089fddce3ddd86a;hpb=6407800521d26b103db4c22d9de709e957381e4b
-
-diff --git a/libavcodec/h264.c b/libavcodec/h264.c
-index 56ef109..da749a2 100644
---- a/libavcodec/h264.c
-+++ b/libavcodec/h264.c
-@@ -2537,11 +2537,17 @@ static enum PixelFormat get_pixel_format(H264Context *h)
-             return s->avctx->color_range == AVCOL_RANGE_JPEG ? AV_PIX_FMT_YUVJ422P
-                                                              : AV_PIX_FMT_YUV422P;
-         } else {
--            return s->avctx->get_format(s->avctx, s->avctx->codec->pix_fmts ?
-+            int i;
-+            const enum AVPixelFormat * fmt = s->avctx->codec->pix_fmts ?
-                                         s->avctx->codec->pix_fmts :
-                                         s->avctx->color_range == AVCOL_RANGE_JPEG ?
-                                         hwaccel_pixfmt_list_h264_jpeg_420 :
--                                        ff_hwaccel_pixfmt_list_420);
-+                                        ff_hwaccel_pixfmt_list_420;
-+
-+            for (i=0; fmt[i] != AV_PIX_FMT_NONE; i++)
-+                if (fmt[i] == s->avctx->pix_fmt)
-+                    return fmt[i];
-+            return s->avctx->get_format(s->avctx, fmt);
-         }
-         break;
-     default: