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

Conflicts:
	community/ginac/PKGBUILD
	community/gnash/PKGBUILD
	community/haskell-tar/PKGBUILD
	community/libdlna/PKGBUILD
	community/mplayer2/PKGBUILD
	community/musescore/PKGBUILD
	community/open-vm-tools-modules/PKGBUILD
	community/paraview/PKGBUILD
	community/picard/PKGBUILD
	core/idnkit/PKGBUILD
	core/ifenslave/PKGBUILD
	extra/audacious/PKGBUILD
	extra/avidemux/PKGBUILD
	extra/ffmpeg/PKGBUILD
	extra/graphite/PKGBUILD
	extra/gstreamer0.10-ugly/PKGBUILD
	extra/k3b/PKGBUILD
	extra/kdemultimedia/PKGBUILD
	extra/koffice/PKGBUILD
	extra/kradio/PKGBUILD
	extra/libreoffice/PKGBUILD
	extra/mediastreamer/PKGBUILD
	extra/poppler/PKGBUILD
	extra/vlc/PKGBUILD
	libre/texlive-bin-libre/PKGBUILD

2 files changed, 48 insertions, 6 deletions

diff --git a/extra/sox/PKGBUILD b/extra/sox/PKGBUILD
index 577657653..a0e982625 100644
--- a/extra/sox/PKGBUILD
+++ b/extra/sox/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 124581 2011-05-23 04:58:46Z eric $
+# $Id: PKGBUILD 142642 2011-11-12 17:15:40Z ibiru $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=sox
 pkgver=14.3.2
-pkgrel=3
+pkgrel=4
 pkgdesc="The Swiss Army knife of sound processing tools"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://sox.sourceforge.net/"
 license=('GPL' 'LGPL')
-depends=('libtool' 'file' 'libsndfile' 'libpng' 'lame' 'opencore-amr')
+depends=('libltdl' 'file' 'libsndfile' 'libpng' 'lame' 'opencore-amr')
 makedepends=('ffmpeg' 'libao' 'libmad' 'libid3tag' 'wavpack' 'libpulse')
 optdepends=('libao: for ao plugin'
             'ffmpeg: for ffmpeg plugin'
@@ -17,12 +17,14 @@ optdepends=('libao: for ao plugin'
             'wavpack: for wavpack plugin'
             'libpulse: for pulse plugin')
 options=('!libtool')
-source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('f6e1999b05d9b0cc9bb47ce8d3208dee')
-sha1sums=('026636c90d7accba76225a2821aaa2ffa6fe41a3')
+source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2
+        sox-14.3.2-ffmpeg.patch)
+sha1sums=('026636c90d7accba76225a2821aaa2ffa6fe41a3'
+          '86caa6aa86a0bf7a048522114d4efd11acbbda70')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -p1 -i "${srcdir}/sox-14.3.2-ffmpeg.patch"
   sed -i 's|man1/sox.1 soxeffect.7|man1/sox.1.gz soxeffect.7.gz|' Makefile.am
   ./configure --prefix=/usr --sysconfdir=/etc \
     --with-dyn-default --with-distro="Arch Linux"
diff --git a/extra/sox/sox-14.3.2-ffmpeg.patch b/extra/sox/sox-14.3.2-ffmpeg.patch
new file mode 100644
index 000000000..5289b9b47
--- /dev/null
+++ b/extra/sox/sox-14.3.2-ffmpeg.patch
@@ -0,0 +1,40 @@
+Index: sox-14.3.2/src/ffmpeg.c
+===================================================================
+--- sox-14.3.2.orig/src/ffmpeg.c
++++ sox-14.3.2/src/ffmpeg.c
+@@ -91,7 +91,7 @@ static int stream_component_open(priv_t
+ 
+   if (!codec || avcodec_open(enc, codec) < 0)
+     return -1;
+-  if (enc->codec_type != CODEC_TYPE_AUDIO) {
++  if (enc->codec_type != AVMEDIA_TYPE_AUDIO) {
+     lsx_fail("ffmpeg CODEC %x is not an audio CODEC", enc->codec_type);
+     return -1;
+   }
+@@ -182,7 +182,7 @@ static int startread(sox_format_t * ft)
+   /* Find audio stream (FIXME: allow different stream to be selected) */
+   for (i = 0; (unsigned)i < ffmpeg->ctxt->nb_streams; i++) {
+     AVCodecContext *enc = ffmpeg->ctxt->streams[i]->codec;
+-    if (enc->codec_type == CODEC_TYPE_AUDIO && ffmpeg->audio_index < 0) {
++    if (enc->codec_type == AVMEDIA_TYPE_AUDIO && ffmpeg->audio_index < 0) {
+       ffmpeg->audio_index = i;
+       break;
+     }
+@@ -273,7 +273,7 @@ static AVStream *add_audio_stream(sox_fo
+ 
+   c = st->codec;
+   c->codec_id = codec_id;
+-  c->codec_type = CODEC_TYPE_AUDIO;
++  c->codec_type = AVMEDIA_TYPE_AUDIO;
+ 
+   /* put sample parameters */
+   c->bit_rate = 256000;  /* FIXME: allow specification */
+@@ -423,7 +423,7 @@ static size_t write_samples(sox_format_t
+       av_init_packet(&pkt);
+       pkt.size = avcodec_encode_audio(c, ffmpeg->audio_buf_aligned, AVCODEC_MAX_AUDIO_FRAME_SIZE, ffmpeg->samples);
+       pkt.pts = av_rescale_q(c->coded_frame->pts, c->time_base, ffmpeg->audio_st->time_base);
+-      pkt.flags |= PKT_FLAG_KEY;
++      pkt.flags |= AV_PKT_FLAG_KEY;
+       pkt.stream_index = ffmpeg->audio_st->index;
+       pkt.data = ffmpeg->audio_buf_aligned;
+