Tue Jun 28 23:10:22 UTC 2011

12 files changed, 174 insertions, 30 deletions

diff --git a/extra/amarok/PKGBUILD b/extra/amarok/PKGBUILD
index 25e794422..ec25b42b8 100644
--- a/extra/amarok/PKGBUILD
+++ b/extra/amarok/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 122696 2011-05-06 06:26:05Z andrea $
+# $Id: PKGBUILD 129446 2011-06-27 20:27:37Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: damir <damir@archlinux.org>
 
 pkgname=amarok
 replaces=('amarok-base' 'amarok-engine-xine' 'amarok-base-mysqlfree')
 pkgver=2.4.1
-pkgrel=1
+pkgrel=3
 pkgdesc="The powerful music player for KDE"
 arch=("i686" "x86_64")
 url="http://amarok.kde.org"
diff --git a/extra/gptfdisk/PKGBUILD b/extra/gptfdisk/PKGBUILD
index c3e5215e6..e376be4fc 100644
--- a/extra/gptfdisk/PKGBUILD
+++ b/extra/gptfdisk/PKGBUILD
@@ -1,21 +1,21 @@
-# $Id: PKGBUILD 126131 2011-06-01 17:33:51Z foutrelis $
+# $Id: PKGBUILD 129374 2011-06-27 05:53:20Z foutrelis $
 # Maintainer: Evangelos Foutras <foutrelis@gmail.com>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: Hokum <hokum_at_mail_dot_ru>
 
 pkgname=gptfdisk
-pkgver=0.7.1
-pkgrel=3
+pkgver=0.7.2
+pkgrel=1
 pkgdesc="A text-mode partitioning tool that works on Globally Unique Identifier (GUID) Partition Table (GPT) disks"
 arch=('i686' 'x86_64')
 url="http://www.rodsbooks.com/gdisk/"
 license=('GPL2')
 depends=('gcc-libs' 'util-linux' 'popt' 'icu')
-provides=('gdisk')
+provides=("gdisk=$pkgver")
 conflicts=('gdisk')
 replaces=('gdisk')
-source=(http://downloads.sourceforge.net/project/$pkgname/$pkgname/$pkgver/$pkgname-$pkgver.tgz)
-md5sums=('7c8d810df61e81c821bef399b832e89e')
+source=(http://downloads.sourceforge.net/project/$pkgname/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz)
+md5sums=('31deeb7acb5104d56ba2ddeafd907513')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/krusader/PKGBUILD b/extra/krusader/PKGBUILD
index 58e113545..439c1024b 100644
--- a/extra/krusader/PKGBUILD
+++ b/extra/krusader/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 129354 2011-06-26 23:28:57Z eric $
+# $Id: PKGBUILD 129430 2011-06-27 12:22:42Z andrea $
 # Maintainer:
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
@@ -7,14 +7,15 @@
 pkgname=krusader
 pkgver=2.4.0beta1
 _pkgver=2.4.0-beta1
-pkgrel=1
+pkgrel=2
 pkgdesc="An alternative file manager for KDE resembling Midnight Commander"
 arch=('i686' 'x86_64')
 url="http://krusader.sourceforge.net/"
 license=('GPL')
 depends=('kdebase-runtime')
-makedepends=('cmake' 'automoc4' 'docbook-xsl')
-optdepends=("kdebase-keditbookmarks: to edit bookmarks")
+makedepends=('cmake' 'automoc4' 'docbook-xsl' 'kdeutils-ark')
+optdepends=("kdebase-keditbookmarks: to edit bookmarks"
+            "kdeutils-ark: extract archive with right-click")
 install=krusader.install
 source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${_pkgver}.tar.bz2)
 md5sums=('d2340718d05d69e7f2a7f0846471ee12')
diff --git a/extra/libmtp/PKGBUILD b/extra/libmtp/PKGBUILD
index c62b8199e..9632630d0 100644
--- a/extra/libmtp/PKGBUILD
+++ b/extra/libmtp/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 123216 2011-05-09 10:21:51Z jgc $
+# $Id: PKGBUILD 127351 2011-06-13 11:09:19Z stephane $
 # Contributor: damir <damir@archlinux.org>
 # Contributor: Kevin Edmonds <edmondskevin@hotmail.com>
 
 pkgname=libmtp
-pkgver=1.0.6
+pkgver=1.1.0
 pkgrel=1
 pkgdesc="library implementation of the Media Transfer Protocol"
 arch=("i686" "x86_64")
@@ -13,17 +13,15 @@ depends=('libusb-compat')
 makedepends=('doxygen')
 options=('!libtool')
 source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('7d3c624d768adba8537f8bc9c0a82cbf')
+md5sums=('fd7b293436528f4c780a9da6e5cc5398')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
+  ./configure --prefix=/usr --with-udev-rules=52-libmtp.rules
   make
 }
 
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
-  
-  install -D -m0644 libmtp.rules "${pkgdir}/lib/udev/rules.d/52-libmtp.rules"
 }
diff --git a/extra/mediastreamer/PKGBUILD b/extra/mediastreamer/PKGBUILD
new file mode 100644
index 000000000..1a97bc8aa
--- /dev/null
+++ b/extra/mediastreamer/PKGBUILD
@@ -0,0 +1,33 @@
+# $Id: PKGBUILD 129367 2011-06-27 05:48:53Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Contributor: Adrià Arrufat <swiftscythe@gmail.com>
+
+pkgname=mediastreamer
+pkgver=2.7.3
+pkgrel=3
+pkgdesc="A library written in C that allows you to create and run audio and video streams"
+arch=('i686' 'x86_64')
+url="http://www.linphone.org"
+license=('GPL')
+depends=('ortp' 'speex' 'v4l-utils' 'ffmpeg')
+makedepends=('cmake' 'automoc4')
+source=("http://download-mirror.savannah.gnu.org/releases/linphone/${pkgname}/${pkgname}-${pkgver}.tar.gz"
+        "disable-v4l1.patch")
+md5sums=('5213307f557d86aa648f1a53a885138c'
+         '7ee15689eed1adbdcf0ddab8fadca34a')
+options=('!libtool')
+
+build() {
+  cd "${srcdir}"/$pkgname-$pkgver/
+  patch -p2 -i "${srcdir}"/disable-v4l1.patch
+
+  ./configure --prefix=/usr \
+    --libexecdir=/usr/lib/mediastreamer/
+  make
+}
+
+package() {
+  cd "${srcdir}"/$pkgname-$pkgver
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/mediastreamer/disable-v4l1.patch b/extra/mediastreamer/disable-v4l1.patch
new file mode 100644
index 000000000..9f6cb84d4
--- /dev/null
+++ b/extra/mediastreamer/disable-v4l1.patch
@@ -0,0 +1,50 @@
+diff -wbBur linphone-3.4.3/mediastreamer2/src/Makefile.am linphone-3.4.3.my/mediastreamer2/src/Makefile.am
+--- linphone-3.4.3/mediastreamer2/src/Makefile.am	2011-02-09 08:43:11.000000000 +0000
++++ linphone-3.4.3.my/mediastreamer2/src/Makefile.am	2011-04-01 14:54:04.000000000 +0000
+@@ -117,7 +117,7 @@
+ endif
+ 
+ if BUILD_V4L
+-libmediastreamer_la_SOURCES+=msv4l.c msv4l2.c
++libmediastreamer_la_SOURCES+=msv4l2.c
+ endif
+ 
+ if BUILD_WIN32
+diff -wbBur linphone-3.4.3/mediastreamer2/src/Makefile.in linphone-3.4.3.my/mediastreamer2/src/Makefile.in
+--- linphone-3.4.3/mediastreamer2/src/Makefile.in	2011-03-28 18:34:07.000000000 +0000
++++ linphone-3.4.3.my/mediastreamer2/src/Makefile.in	2011-04-01 14:55:00.000000000 +0000
+@@ -54,7 +54,7 @@
+ @BUILD_MACAQSND_TRUE@am__append_12 = aqsnd.c
+ @BUILD_PULSEAUDIO_TRUE@am__append_13 = pulseaudio.c
+ @BUILD_MACOSX_TRUE@@BUILD_VIDEO_TRUE@am__append_14 = msv4m.m
+-@BUILD_V4L_TRUE@@BUILD_VIDEO_TRUE@am__append_15 = msv4l.c msv4l2.c
++@BUILD_V4L_TRUE@@BUILD_VIDEO_TRUE@am__append_15 = msv4l2.c
+ @BUILD_VIDEO_TRUE@@BUILD_WIN32_TRUE@am__append_16 = msdscap-mingw.cc drawdib-display.c
+ @BUILD_THEORA_TRUE@@BUILD_VIDEO_TRUE@am__append_17 = theora.c
+ @BUILD_FFMPEG_TRUE@@BUILD_VIDEO_TRUE@am__append_18 = videoenc.c \
+@@ -135,7 +135,7 @@
+ 	audiostream.c msspeex.c speexec.c gsm.c winsnd3.c \
+ 	msfileplayer_win.c msfilerec_win.c msfileplayer.c msfilerec.c \
+ 	msresample.c alsa.c oss.c arts.c pasnd.c macsnd.c msiounit.c \
+-	aqsnd.c pulseaudio.c msv4m.m msv4l.c msv4l2.c msdscap-mingw.cc \
++	aqsnd.c pulseaudio.c msv4m.m msv4l2.c msdscap-mingw.cc \
+ 	drawdib-display.c theora.c videoenc.c videodec.c pixconv.c \
+ 	sizeconv.c nowebcam.c nowebcam.h swscale.h ffmpeg-priv.h \
+ 	h264dec.c jpegwriter.c videoout.c x11video.c rfc2429.h \
+@@ -156,7 +156,7 @@
+ @BUILD_MACAQSND_TRUE@am__objects_12 = aqsnd.lo
+ @BUILD_PULSEAUDIO_TRUE@am__objects_13 = pulseaudio.lo
+ @BUILD_MACOSX_TRUE@@BUILD_VIDEO_TRUE@am__objects_14 = msv4m.lo
+-@BUILD_V4L_TRUE@@BUILD_VIDEO_TRUE@am__objects_15 = msv4l.lo msv4l2.lo
++@BUILD_V4L_TRUE@@BUILD_VIDEO_TRUE@am__objects_15 = msv4l2.lo
+ @BUILD_VIDEO_TRUE@@BUILD_WIN32_TRUE@am__objects_16 = msdscap-mingw.lo \
+ @BUILD_VIDEO_TRUE@@BUILD_WIN32_TRUE@	drawdib-display.lo
+ @BUILD_THEORA_TRUE@@BUILD_VIDEO_TRUE@am__objects_17 = theora.lo
+@@ -600,7 +600,6 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mssndcard.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/msspeex.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/msticker.Plo@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/msv4l.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/msv4l2.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/msv4m.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/msvideo.Plo@am__quote@
diff --git a/extra/neon/PKGBUILD b/extra/neon/PKGBUILD
index 3e908b618..3732a7196 100644
--- a/extra/neon/PKGBUILD
+++ b/extra/neon/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 124952 2011-05-25 12:20:04Z andrea $
+# $Id: PKGBUILD 129362 2011-06-27 05:41:06Z andrea $
 # Maintainer:
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 # Contributor: Juergen Hoetzel <juergen@archlinux.org>
 
 pkgname=neon
 pkgver=0.29.6
-pkgrel=1
+pkgrel=2
 pkgdesc="HTTP and WebDAV client library with a C interface"
 arch=('i686' 'x86_64')
 license=('GPL' 'LGPL')
@@ -24,6 +24,9 @@ build() {
     --with-ssl=openssl \
     --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt
   make
+
+  # fix invalid .so links in man pages (FS#24902)
+  sed -i '/^\.so/s|\.so \([^.]\+\)\.\([[:digit:]]\)|.so man\2/\1.\2|' doc/man/*
 }
 
 package() {
diff --git a/extra/rdesktop/PKGBUILD b/extra/rdesktop/PKGBUILD
index c2adab552..07f51ce8b 100644
--- a/extra/rdesktop/PKGBUILD
+++ b/extra/rdesktop/PKGBUILD
@@ -1,19 +1,20 @@
-# $Id: PKGBUILD 120030 2011-04-18 14:48:32Z andrea $
+# $Id: PKGBUILD 129462 2011-06-28 03:34:32Z heftig $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Dan McGee <dan@archlinux.org>
 
 pkgname=rdesktop
 pkgver=1.7.0
-pkgrel=1
+pkgrel=2
 depends=('libx11' 'openssl' 'libao' 'libsamplerate')
 pkgdesc="An open source client for Windows Remote Desktop Services"
 url="http://www.rdesktop.org/"
 license=('GPL')
 arch=('i686' 'x86_64')
 source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz"
-        'rdesktop-send_physical_buttons.diff')
+        'rdesktop-send_physical_buttons.diff' 'rdesktop-libao.patch')
 md5sums=('77fa93b21aa38837a85e81c00e757228'
-         '880d3aeac67b901e6bf44d1323374768')
+         '880d3aeac67b901e6bf44d1323374768'
+         'bd2c9bc68bddcc2652c668753d787df7')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
@@ -21,6 +22,9 @@ build() {
   # FS#15113
   patch -i ${srcdir}/rdesktop-send_physical_buttons.diff
 
+  # Fix libao segfault, from Fedora
+  patch -i ${srcdir}/rdesktop-libao.patch
+
   ./configure --prefix=/usr
   make
 }
diff --git a/extra/rdesktop/rdesktop-libao.patch b/extra/rdesktop/rdesktop-libao.patch
new file mode 100644
index 000000000..1f3dea9ed
--- /dev/null
+++ b/extra/rdesktop/rdesktop-libao.patch
@@ -0,0 +1,20 @@
+diff -up rdesktop-1.6.0/rdpsnd_libao.c.ao rdesktop-1.6.0/rdpsnd_libao.c
+--- rdesktop-1.6.0/rdpsnd_libao.c.ao	2007-10-30 14:57:30.000000000 +0100
++++ rdesktop-1.6.0/rdpsnd_libao.c	2010-12-02 21:22:39.000000000 +0100
+@@ -76,7 +76,7 @@ libao_open(void)
+ 	format.channels = 2;
+ 	format.rate = 44100;
+ 	format.byte_format = AO_FMT_NATIVE;
+-
++	format.matrix = NULL;
+ 
+ 	o_device = ao_open_live(default_driver, &format, NULL);
+ 	if (o_device == NULL)
+@@ -115,6 +115,7 @@ libao_set_format(RD_WAVEFORMATEX * pwfx)
+ 	format.channels = pwfx->nChannels;
+ 	format.rate = 44100;
+ 	format.byte_format = AO_FMT_NATIVE;
++	format.matrix = NULL;
+ 
+ 	if (o_device != NULL)
+ 		ao_close(o_device);
diff --git a/extra/rhythmbox/PKGBUILD b/extra/rhythmbox/PKGBUILD
index 29a97dc46..a1644664b 100644
--- a/extra/rhythmbox/PKGBUILD
+++ b/extra/rhythmbox/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 127104 2011-06-10 17:27:06Z ibiru $
+# $Id: PKGBUILD 127360 2011-06-13 15:53:46Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 
 pkgname=rhythmbox
 pkgver=2.90.1.git20110610
-pkgrel=1
+pkgrel=2
 pkgdesc="An iTunes-like music player/libary"
 arch=('i686' 'x86_64')
 license=('GPL')
diff --git a/extra/vlc/PKGBUILD b/extra/vlc/PKGBUILD
index 95361e280..c861b3ac6 100644
--- a/extra/vlc/PKGBUILD
+++ b/extra/vlc/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 127816 2011-06-18 16:12:17Z ibiru $
+# $Id: PKGBUILD 129407 2011-06-27 11:36:20Z stephane $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
 # Contributor: Martin Sandsmark <martin.sandsmark@kde.org>
 
 pkgname=vlc
 pkgver=1.1.10
-pkgrel=4
+pkgrel=5
 pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player"
 arch=('i686' 'x86_64')
 url="http://www.videolan.org/vlc/"
@@ -34,13 +34,19 @@ conflicts=('vlc-plugin')
 replaces=('vlc-plugin')
 options=('!libtool')
 install=vlc.install
-source=("http://download.videolan.org/pub/videolan/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('066cb94b1e3aa848d828121354d6be4d')
+source=("http://download.videolan.org/pub/videolan/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2"
+        vlc-1.1.10-libavformat.patch)
+md5sums=('066cb94b1e3aa848d828121354d6be4d'
+         '9b82571a594e08e67fbae9c96c3f3ed7')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
   sed -i -e 's:truetype/freefont:TTF:g' modules/misc/freetype.c
+
+  # FS#24872
+  patch -Np1 -i ../vlc-1.1.10-libavformat.patch
+
   ./configure --prefix=/usr \
               --disable-rpath \
               --enable-faad \
diff --git a/extra/vlc/vlc-1.1.10-libavformat.patch b/extra/vlc/vlc-1.1.10-libavformat.patch
new file mode 100644
index 000000000..4bec72334
--- /dev/null
+++ b/extra/vlc/vlc-1.1.10-libavformat.patch
@@ -0,0 +1,29 @@
+From 21260bbb732d9de5540f809e1a54bde740f12a95 Mon Sep 17 00:00:00 2001
+From: Laurent Aimar <fenrir@videolan.org>
+Date: Tue, 7 Jun 2011 00:43:56 +0200
+Subject: [PATCH] Fix ByteIOContext init on recent libavformat
+
+Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
+(cherry picked from commit 4fc3bd15a3844e41a75760fa8e100feecea969a5)
+
+Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
+---
+ modules/demux/avformat/demux.c |    3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+diff --git a/modules/demux/avformat/demux.c b/modules/demux/avformat/demux.c
+index fbb0b28..bd7c166 100644
+--- a/modules/demux/avformat/demux.c
++++ b/modules/demux/avformat/demux.c
+@@ -210,6 +210,9 @@ int OpenDemux( vlc_object_t *p_this )
+        */
+        p_sys->url.is_streamed = 1;
+        p_sys->io.is_streamed = 1;
++#if defined(AVIO_SEEKABLE_NORMAL)
++       p_sys->io.seekable = 0;
++#endif
+     }
+
+
+--
+1.7.2.5