summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--community/collectd/PKGBUILD36
-rw-r--r--community/collectd/yajl-2.x.patch4
-rw-r--r--community/gmic/PKGBUILD10
-rw-r--r--community/kdenlive/PKGBUILD4
-rw-r--r--community/libmemcached/PKGBUILD6
-rw-r--r--community/linphone/PKGBUILD4
-rw-r--r--community/php-memcached/PKGBUILD4
-rw-r--r--community/prosody/PKGBUILD6
-rw-r--r--community/psimedia/PKGBUILD28
-rw-r--r--community/psimedia/psimedia-svn20110621.diff.gzbin0 -> 10776 bytes
-rw-r--r--community/psimedia/videodev.h320
-rw-r--r--community/python-yaml/PKGBUILD8
-rw-r--r--community/qtcreator/PKGBUILD8
-rw-r--r--community/redis/PKGBUILD6
-rw-r--r--community/tracker/PKGBUILD6
-rw-r--r--community/ushare/PKGBUILD23
-rwxr-xr-xcommunity/ushare/ushare2
-rw-r--r--community/ushare/ushare.install16
-rw-r--r--extra/audacious/PKGBUILD8
-rw-r--r--extra/exiv2/PKGBUILD6
-rw-r--r--extra/farsight2/PKGBUILD8
-rw-r--r--extra/ffmpeg/PKGBUILD2
-rw-r--r--extra/ffmpeg/avutils-make-aes-and-sha-public.patch37
-rw-r--r--extra/postgresql-old-upgrade/PKGBUILD47
-rw-r--r--extra/postgresql-old-upgrade/build.patch11
-rw-r--r--extra/strigi/PKGBUILD27
-rw-r--r--extra/telepathy-farsight/PKGBUILD6
-rw-r--r--extra/telepathy-glib/PKGBUILD6
-rw-r--r--extra/xulrunner/PKGBUILD31
-rw-r--r--libre/libquicktime-libre/PKGBUILD34
-rw-r--r--libre/mplayer-libre/PKGBUILD116
-rw-r--r--libre/mplayer-libre/mplayer.desktop2
-rw-r--r--multilib-testing/lib32-glibc/PKGBUILD27
-rw-r--r--multilib-testing/lib32-glibc/glibc-2.14-fix-resolver-crash-typo.patch22
-rw-r--r--multilib-testing/lib32-glibc/glibc-2.14-reexport-rpc-interface.patch26
-rw-r--r--multilib-testing/lib32-glibc/glibc-2.14-reinstall-nis-rpc-headers.patch28
-rw-r--r--testing/ffmpeg/PKGBUILD51
-rw-r--r--~fauno/distccd-zeroconf/PKGBUILD50
-rwxr-xr-x~fauno/distccd-zeroconf/distccd38
-rw-r--r--~fauno/distccd-zeroconf/distccd.conf.d8
40 files changed, 906 insertions, 176 deletions
diff --git a/community/collectd/PKGBUILD b/community/collectd/PKGBUILD
index 35134a563..13e30b18f 100644
--- a/community/collectd/PKGBUILD
+++ b/community/collectd/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 45620 2011-04-26 00:57:42Z dreisner $
+# $Id: PKGBUILD 49776 2011-06-21 04:55:41Z foutrelis $
# Maintainer: Gaetan Bisson <bisson@archlinux.org>
# Contributor: Gerhard Brauer <gerhard.brauer@web.de>
pkgname=collectd
pkgver=5.0.0
-pkgrel=3
+pkgrel=5
pkgdesc='Daemon which collects system performance statistics periodically'
arch=('i686' 'x86_64' 'mips64el')
url='http://collectd.org/'
@@ -43,26 +43,29 @@ depends=('libtool')
source=("${url}files/$pkgname-$pkgver.tar.gz"
'libnotify-0.7.patch'
- 'rc.d'
- 'yajl-2.x.patch')
+ 'yajl-2.x.patch'
+ 'rc.d')
sha1sums=('026e5121348f0e525dedb3844fe61c7713994bb7'
'f6fed097c16f6c9c90b9a32a5b8e48d54b35b337'
- '0f441718d5519cb043b1130e5a1d0379078adbcc'
- '2586559fc8d2b54f3d242a3e815ed81e81e0341b')
+ 'd3854c39c9596b4f6dcf67a9eb8decea4d17120d'
+ '0f441718d5519cb043b1130e5a1d0379078adbcc')
install=install
build() {
cd "$srcdir/$pkgname-$pkgver"
- unset LDFLAGS # or perl not found
- patch -p1 -i ../libnotify-0.7.patch
-
- # fixes for yajl 2.x API changes
- patch -Np0 < "$srcdir/yajl-2.x.patch"
+ unset LDFLAGS # or libperl not found
+ patch -p1 -i ../libnotify-0.7.patch
+ patch -p1 -i ../yajl-2.x.patch
sed -i 's/ipt_error_target/bozo_error_target/g' src/owniptc/libiptc.c
- ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
- --enable-static=no --with-python=/usr/bin/python2
+
+ ./configure \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --localstatedir=/var \
+ --enable-static=no \
+ --with-python=/usr/bin/python2
# avoid -Werror with gcc 4.6
sed -i '/^AM_CFLAGS/s/ -Werror//' src/Makefile
@@ -72,8 +75,9 @@ build() {
package() {
cd "$srcdir/$pkgname-$pkgver"
- make DESTDIR="$pkgdir/" install
+
+ make DESTDIR="$pkgdir" install
+
install -D -m 755 ../rc.d "$pkgdir/etc/rc.d/$pkgname"
- install -D -m 644 contrib/collectd2html.pl \
- "$pkgdir"/usr/share/collectd/collectd2html.pl
+ install -D -m 644 contrib/collectd2html.pl "$pkgdir"/usr/share/collectd/collectd2html.pl
}
diff --git a/community/collectd/yajl-2.x.patch b/community/collectd/yajl-2.x.patch
index 6cd208006..b90543dfe 100644
--- a/community/collectd/yajl-2.x.patch
+++ b/community/collectd/yajl-2.x.patch
@@ -1,5 +1,5 @@
---- src/curl_json.c 2011-04-25 20:43:00.972938855 -0400
-+++ src/curl_json.c 2011-04-25 20:46:03.859938860 -0400
+--- old/src/curl_json.c 2011-04-25 20:43:00.972938855 -0400
++++ new/src/curl_json.c 2011-04-25 20:46:03.859938860 -0400
@@ -98,8 +98,7 @@
return (0);
diff --git a/community/gmic/PKGBUILD b/community/gmic/PKGBUILD
index 76b974f91..ffd80bc9a 100644
--- a/community/gmic/PKGBUILD
+++ b/community/gmic/PKGBUILD
@@ -1,21 +1,21 @@
-# $Id: PKGBUILD 42692 2011-03-19 21:21:42Z spupykin $
+# $Id: PKGBUILD 49838 2011-06-21 10:30:54Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
# Contributor: farid <farid at archlinuc-br.org>
# Contributor: Archie <Mymaud@gmail.com>
pkgbase=gmic
-pkgname=(gmic gimp-plugin-gmic)
-pkgver=1.4.8.3
+pkgname=('gmic' 'gimp-plugin-gmic')
+pkgver=1.4.9.5
pkgrel=1
pkgdesc="GMIC image procession framework"
arch=('i686' 'x86_64' 'mips64el')
license=('custom:CeCILL')
url="http://gmic.sourceforge.net"
-makedepends=('gimp' 'fftw' 'lapack' 'opencv' 'graphicsmagick' 'openexr')
+makedepends=('gimp' 'fftw' 'lapack' 'opencv' 'graphicsmagick' 'openexr' 'imagemagick')
options=('docs' '!emptydirs')
source=("http://downloads.sourceforge.net/sourceforge/gmic/gmic_$pkgver.tar.gz")
-md5sums=('c8921256f64af774860a8f9021dc6457')
+md5sums=('52144b574562cb7cace75f814473f117')
build() {
cd "$srcdir/gmic-$pkgver"
diff --git a/community/kdenlive/PKGBUILD b/community/kdenlive/PKGBUILD
index 8a1e95af1..465cbbb95 100644
--- a/community/kdenlive/PKGBUILD
+++ b/community/kdenlive/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 45687 2011-04-27 09:20:17Z spupykin $
+# $Id: PKGBUILD 49851 2011-06-21 11:51:31Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Contributor: Zuf <kontakt.zuf@gmail.com>
# Contributor: Darwin Bautista <djclue917@gmail.com>
pkgname=kdenlive
pkgver=0.8
-pkgrel=1
+pkgrel=2
pkgdesc="A non-linear video editor for Linux"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.kdenlive.org/"
diff --git a/community/libmemcached/PKGBUILD b/community/libmemcached/PKGBUILD
index 59452990e..8d35c0328 100644
--- a/community/libmemcached/PKGBUILD
+++ b/community/libmemcached/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 45111 2011-04-16 15:56:21Z foutrelis $
+# $Id: PKGBUILD 49787 2011-06-21 05:02:34Z foutrelis $
# Maintainer: Evangelos Foutras <foutrelis@gmail.com>
pkgname=libmemcached
-pkgver=0.49
+pkgver=0.50
pkgrel=1
pkgdesc="C and C++ client library to the memcached server"
arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ depends=('glibc')
makedepends=('perl')
options=('!libtool')
source=(http://launchpad.net/$pkgname/1.0/$pkgver/+download/$pkgname-$pkgver.tar.gz)
-md5sums=('95f2e182192934c0dd043eaecd8caa20')
+md5sums=('c8627014a37cd821cf93317b8de6f9f8')
build() {
cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/linphone/PKGBUILD b/community/linphone/PKGBUILD
index 2d502fa73..080dc9ed7 100644
--- a/community/linphone/PKGBUILD
+++ b/community/linphone/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 47124 2011-05-17 07:27:45Z andrea $
+# $Id: PKGBUILD 49813 2011-06-21 09:18:21Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Contributor: Darwin Bautista <djclue917@gmail.com>
pkgname=linphone
pkgver=3.4.3
-pkgrel=3
+pkgrel=4
pkgdesc="A Voice-over-IP phone"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.linphone.org/index.php/eng"
diff --git a/community/php-memcached/PKGBUILD b/community/php-memcached/PKGBUILD
index 7e574c98c..f5894f448 100644
--- a/community/php-memcached/PKGBUILD
+++ b/community/php-memcached/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 45116 2011-04-16 15:57:12Z foutrelis $
+# $Id: PKGBUILD 49774 2011-06-21 04:55:35Z foutrelis $
# Maintainer: Evangelos Foutras <foutrelis@gmail.com>
pkgname=php-memcached
pkgver=1.0.2
-pkgrel=4
+pkgrel=5
pkgdesc="PHP extension for interfacing with memcached via libmemcached library"
arch=('i686' 'x86_64' 'mips64el')
url="http://pecl.php.net/package/memcached"
diff --git a/community/prosody/PKGBUILD b/community/prosody/PKGBUILD
index 34a000900..0d6a57414 100644
--- a/community/prosody/PKGBUILD
+++ b/community/prosody/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 48848 2011-06-06 14:44:51Z spupykin $
+# $Id: PKGBUILD 49803 2011-06-21 09:01:01Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Maintainer: Dwayne Bent <dbb.0@liqd.org>
# Contributor: Paul-Sebastian Manole <brokenthorn@gmail.com>
pkgname=prosody
-pkgver=0.8.1
+pkgver=0.8.2
pkgrel=1
pkgdesc="Lightweight and extensible Jabber/XMPP server written in Lua."
arch=('i686' 'x86_64' 'mips64el')
@@ -21,7 +21,7 @@ source=("http://prosody.im/depot/${pkgver}/prosody-${pkgver}.tar.gz"
'prosody.rcd'
'prosody.logrotated'
'fix-config.patch')
-md5sums=('2be3e9deed0b96f109efc5707d7728ba'
+md5sums=('6e907bf0d0acf24f1011083020ba6ffb'
'd2b5f9c8e42bb31819e715eb1756ee53'
'26466fdbea87963a3ca6f48f76fe4a29'
'59a1bf2dfd0bd386cef6fa646e2a3752')
diff --git a/community/psimedia/PKGBUILD b/community/psimedia/PKGBUILD
index 43e25240a..baff02667 100644
--- a/community/psimedia/PKGBUILD
+++ b/community/psimedia/PKGBUILD
@@ -1,21 +1,33 @@
+# $Id: PKGBUILD 49833 2011-06-21 09:57:22Z spupykin $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Contributor: Vladimir Kutyavin <vlkut-at-bk-dot-ru>
pkgname=psimedia
pkgver=1.0.3
-pkgrel=5
+pkgrel=7
pkgdesc="Voice and video chat plugin for Psi-like IM clients. The implementation is based on GStreamer."
arch=('i686' 'x86_64' 'mips64el')
license=('GPL2')
url="http://delta.affinix.com/psimedia/"
-depends=('psi' 'speex' 'gstreamer0.10-base' 'qt' 'gstreamer0.10-good-plugins')
+depends=('psi' 'speex' 'gstreamer0.10-base' 'qt' 'gstreamer0.10-good-plugins'
+ 'liboil')
makedepends=('pkgconfig')
-source=(http://delta.affinix.com/download/psimedia/$pkgname-$pkgver.tar.bz2)
-md5sums=('1be71c37d71c655ffc2c53cf86c77a7a')
+source=(http://delta.affinix.com/download/psimedia/$pkgname-$pkgver.tar.bz2
+ videodev.h
+ psimedia-svn20110621.diff.gz)
+md5sums=('1be71c37d71c655ffc2c53cf86c77a7a'
+ '427e5832466726a86e5b55b1329d2e9e'
+ 'b571639d854c90c758f40a44054c6e06')
build() {
- cd $srcdir/$pkgname-$pkgver
- ./configure
- make || return 1
- install -D -m644 ${srcdir}/$pkgname-$pkgver/gstprovider/libgstprovider.so ${pkgdir}/usr/lib/psi/plugins/libgstprovider.so
+ cd $srcdir/$pkgname-$pkgver
+ patch -p1 <$srcdir/psimedia-svn20110621.diff
+ sed -i 's|# include <linux/videodev.h>|# include "../../../videodev.h"|' gstprovider/deviceenum/deviceenum_unix.cpp
+ ./configure
+ make
}
+package() {
+ cd $srcdir/$pkgname-$pkgver
+ install -D -m644 ${srcdir}/$pkgname-$pkgver/gstprovider/libgstprovider.so ${pkgdir}/usr/lib/psi/plugins/libgstprovider.so
+}
diff --git a/community/psimedia/psimedia-svn20110621.diff.gz b/community/psimedia/psimedia-svn20110621.diff.gz
new file mode 100644
index 000000000..aeb969794
--- /dev/null
+++ b/community/psimedia/psimedia-svn20110621.diff.gz
Binary files differ
diff --git a/community/psimedia/videodev.h b/community/psimedia/videodev.h
new file mode 100644
index 000000000..c51a5f9cb
--- /dev/null
+++ b/community/psimedia/videodev.h
@@ -0,0 +1,320 @@
+/*
+ * Video for Linux version 1 - OBSOLETE
+ *
+ * Header file for v4l1 drivers and applications, for
+ * Linux kernels 2.2.x or 2.4.x.
+ *
+ * Provides header for legacy drivers and applications
+ *
+ * See http://linuxtv.org for more info
+ *
+ */
+#ifndef __LINUX_VIDEODEV_H
+#define __LINUX_VIDEODEV_H
+
+#include <linux/types.h>
+#include <linux/ioctl.h>
+#include <linux/videodev2.h>
+
+
+#define VID_TYPE_CAPTURE 1 /* Can capture */
+#define VID_TYPE_TUNER 2 /* Can tune */
+#define VID_TYPE_TELETEXT 4 /* Does teletext */
+#define VID_TYPE_OVERLAY 8 /* Overlay onto frame buffer */
+#define VID_TYPE_CHROMAKEY 16 /* Overlay by chromakey */
+#define VID_TYPE_CLIPPING 32 /* Can clip */
+#define VID_TYPE_FRAMERAM 64 /* Uses the frame buffer memory */
+#define VID_TYPE_SCALES 128 /* Scalable */
+#define VID_TYPE_MONOCHROME 256 /* Monochrome only */
+#define VID_TYPE_SUBCAPTURE 512 /* Can capture subareas of the image */
+#define VID_TYPE_MPEG_DECODER 1024 /* Can decode MPEG streams */
+#define VID_TYPE_MPEG_ENCODER 2048 /* Can encode MPEG streams */
+#define VID_TYPE_MJPEG_DECODER 4096 /* Can decode MJPEG streams */
+#define VID_TYPE_MJPEG_ENCODER 8192 /* Can encode MJPEG streams */
+
+struct video_capability
+{
+ char name[32];
+ int type;
+ int channels; /* Num channels */
+ int audios; /* Num audio devices */
+ int maxwidth; /* Supported width */
+ int maxheight; /* And height */
+ int minwidth; /* Supported width */
+ int minheight; /* And height */
+};
+
+
+struct video_channel
+{
+ int channel;
+ char name[32];
+ int tuners;
+ __u32 flags;
+#define VIDEO_VC_TUNER 1 /* Channel has a tuner */
+#define VIDEO_VC_AUDIO 2 /* Channel has audio */
+ __u16 type;
+#define VIDEO_TYPE_TV 1
+#define VIDEO_TYPE_CAMERA 2
+ __u16 norm; /* Norm set by channel */
+};
+
+struct video_tuner
+{
+ int tuner;
+ char name[32];
+ unsigned long rangelow, rangehigh; /* Tuner range */
+ __u32 flags;
+#define VIDEO_TUNER_PAL 1
+#define VIDEO_TUNER_NTSC 2
+#define VIDEO_TUNER_SECAM 4
+#define VIDEO_TUNER_LOW 8 /* Uses KHz not MHz */
+#define VIDEO_TUNER_NORM 16 /* Tuner can set norm */
+#define VIDEO_TUNER_STEREO_ON 128 /* Tuner is seeing stereo */
+#define VIDEO_TUNER_RDS_ON 256 /* Tuner is seeing an RDS datastream */
+#define VIDEO_TUNER_MBS_ON 512 /* Tuner is seeing an MBS datastream */
+ __u16 mode; /* PAL/NTSC/SECAM/OTHER */
+#define VIDEO_MODE_PAL 0
+#define VIDEO_MODE_NTSC 1
+#define VIDEO_MODE_SECAM 2
+#define VIDEO_MODE_AUTO 3
+ __u16 signal; /* Signal strength 16bit scale */
+};
+
+struct video_picture
+{
+ __u16 brightness;
+ __u16 hue;
+ __u16 colour;
+ __u16 contrast;
+ __u16 whiteness; /* Black and white only */
+ __u16 depth; /* Capture depth */
+ __u16 palette; /* Palette in use */
+#define VIDEO_PALETTE_GREY 1 /* Linear greyscale */
+#define VIDEO_PALETTE_HI240 2 /* High 240 cube (BT848) */
+#define VIDEO_PALETTE_RGB565 3 /* 565 16 bit RGB */
+#define VIDEO_PALETTE_RGB24 4 /* 24bit RGB */
+#define VIDEO_PALETTE_RGB32 5 /* 32bit RGB */
+#define VIDEO_PALETTE_RGB555 6 /* 555 15bit RGB */
+#define VIDEO_PALETTE_YUV422 7 /* YUV422 capture */
+#define VIDEO_PALETTE_YUYV 8
+#define VIDEO_PALETTE_UYVY 9 /* The great thing about standards is ... */
+#define VIDEO_PALETTE_YUV420 10
+#define VIDEO_PALETTE_YUV411 11 /* YUV411 capture */
+#define VIDEO_PALETTE_RAW 12 /* RAW capture (BT848) */
+#define VIDEO_PALETTE_YUV422P 13 /* YUV 4:2:2 Planar */
+#define VIDEO_PALETTE_YUV411P 14 /* YUV 4:1:1 Planar */
+#define VIDEO_PALETTE_YUV420P 15 /* YUV 4:2:0 Planar */
+#define VIDEO_PALETTE_YUV410P 16 /* YUV 4:1:0 Planar */
+#define VIDEO_PALETTE_PLANAR 13 /* start of planar entries */
+#define VIDEO_PALETTE_COMPONENT 7 /* start of component entries */
+};
+
+struct video_audio
+{
+ int audio; /* Audio channel */
+ __u16 volume; /* If settable */
+ __u16 bass, treble;
+ __u32 flags;
+#define VIDEO_AUDIO_MUTE 1
+#define VIDEO_AUDIO_MUTABLE 2
+#define VIDEO_AUDIO_VOLUME 4
+#define VIDEO_AUDIO_BASS 8
+#define VIDEO_AUDIO_TREBLE 16
+#define VIDEO_AUDIO_BALANCE 32
+ char name[16];
+#define VIDEO_SOUND_MONO 1
+#define VIDEO_SOUND_STEREO 2
+#define VIDEO_SOUND_LANG1 4
+#define VIDEO_SOUND_LANG2 8
+ __u16 mode;
+ __u16 balance; /* Stereo balance */
+ __u16 step; /* Step actual volume uses */
+};
+
+struct video_clip
+{
+ __s32 x,y;
+ __s32 width, height;
+ struct video_clip *next; /* For user use/driver use only */
+};
+
+struct video_window
+{
+ __u32 x,y; /* Position of window */
+ __u32 width,height; /* Its size */
+ __u32 chromakey;
+ __u32 flags;
+ struct video_clip *clips; /* Set only */
+ int clipcount;
+#define VIDEO_WINDOW_INTERLACE 1
+#define VIDEO_WINDOW_CHROMAKEY 16 /* Overlay by chromakey */
+#define VIDEO_CLIP_BITMAP -1
+/* bitmap is 1024x625, a '1' bit represents a clipped pixel */
+#define VIDEO_CLIPMAP_SIZE (128 * 625)
+};
+
+struct video_capture
+{
+ __u32 x,y; /* Offsets into image */
+ __u32 width, height; /* Area to capture */
+ __u16 decimation; /* Decimation divider */
+ __u16 flags; /* Flags for capture */
+#define VIDEO_CAPTURE_ODD 0 /* Temporal */
+#define VIDEO_CAPTURE_EVEN 1
+};
+
+struct video_buffer
+{
+ void *base;
+ int height,width;
+ int depth;
+ int bytesperline;
+};
+
+struct video_mmap
+{
+ unsigned int frame; /* Frame (0 - n) for double buffer */
+ int height,width;
+ unsigned int format; /* should be VIDEO_PALETTE_* */
+};
+
+struct video_key
+{
+ __u8 key[8];
+ __u32 flags;
+};
+
+struct video_mbuf
+{
+ int size; /* Total memory to map */
+ int frames; /* Frames */
+ int offsets[VIDEO_MAX_FRAME];
+};
+
+#define VIDEO_NO_UNIT (-1)
+
+struct video_unit
+{
+ int video; /* Video minor */
+ int vbi; /* VBI minor */
+ int radio; /* Radio minor */
+ int audio; /* Audio minor */
+ int teletext; /* Teletext minor */
+};
+
+struct vbi_format {
+ __u32 sampling_rate; /* in Hz */
+ __u32 samples_per_line;
+ __u32 sample_format; /* VIDEO_PALETTE_RAW only (1 byte) */
+ __s32 start[2]; /* starting line for each frame */
+ __u32 count[2]; /* count of lines for each frame */
+ __u32 flags;
+#define VBI_UNSYNC 1 /* can distingues between top/bottom field */
+#define VBI_INTERLACED 2 /* lines are interlaced */
+};
+
+/* video_info is biased towards hardware mpeg encode/decode */
+/* but it could apply generically to any hardware compressor/decompressor */
+struct video_info
+{
+ __u32 frame_count; /* frames output since decode/encode began */
+ __u32 h_size; /* current unscaled horizontal size */
+ __u32 v_size; /* current unscaled veritcal size */
+ __u32 smpte_timecode; /* current SMPTE timecode (for current GOP) */
+ __u32 picture_type; /* current picture type */
+ __u32 temporal_reference; /* current temporal reference */
+ __u8 user_data[256]; /* user data last found in compressed stream */
+ /* user_data[0] contains user data flags, user_data[1] has count */
+};
+
+/* generic structure for setting playback modes */
+struct video_play_mode
+{
+ int mode;
+ int p1;
+ int p2;
+};
+
+/* for loading microcode / fpga programming */
+struct video_code
+{
+ char loadwhat[16]; /* name or tag of file being passed */
+ int datasize;
+ __u8 *data;
+};
+
+#define VIDIOCGCAP _IOR('v',1,struct video_capability) /* Get capabilities */
+#define VIDIOCGCHAN _IOWR('v',2,struct video_channel) /* Get channel info (sources) */
+#define VIDIOCSCHAN _IOW('v',3,struct video_channel) /* Set channel */
+#define VIDIOCGTUNER _IOWR('v',4,struct video_tuner) /* Get tuner abilities */
+#define VIDIOCSTUNER _IOW('v',5,struct video_tuner) /* Tune the tuner for the current channel */
+#define VIDIOCGPICT _IOR('v',6,struct video_picture) /* Get picture properties */
+#define VIDIOCSPICT _IOW('v',7,struct video_picture) /* Set picture properties */
+#define VIDIOCCAPTURE _IOW('v',8,int) /* Start, end capture */
+#define VIDIOCGWIN _IOR('v',9, struct video_window) /* Get the video overlay window */
+#define VIDIOCSWIN _IOW('v',10, struct video_window) /* Set the video overlay window - passes clip list for hardware smarts , chromakey etc */
+#define VIDIOCGFBUF _IOR('v',11, struct video_buffer) /* Get frame buffer */
+#define VIDIOCSFBUF _IOW('v',12, struct video_buffer) /* Set frame buffer - root only */
+#define VIDIOCKEY _IOR('v',13, struct video_key) /* Video key event - to dev 255 is to all - cuts capture on all DMA windows with this key (0xFFFFFFFF == all) */
+#define VIDIOCGFREQ _IOR('v',14, unsigned long) /* Set tuner */
+#define VIDIOCSFREQ _IOW('v',15, unsigned long) /* Set tuner */
+#define VIDIOCGAUDIO _IOR('v',16, struct video_audio) /* Get audio info */
+#define VIDIOCSAUDIO _IOW('v',17, struct video_audio) /* Audio source, mute etc */
+#define VIDIOCSYNC _IOW('v',18, int) /* Sync with mmap grabbing */
+#define VIDIOCMCAPTURE _IOW('v',19, struct video_mmap) /* Grab frames */
+#define VIDIOCGMBUF _IOR('v',20, struct video_mbuf) /* Memory map buffer info */
+#define VIDIOCGUNIT _IOR('v',21, struct video_unit) /* Get attached units */
+#define VIDIOCGCAPTURE _IOR('v',22, struct video_capture) /* Get subcapture */
+#define VIDIOCSCAPTURE _IOW('v',23, struct video_capture) /* Set subcapture */
+#define VIDIOCSPLAYMODE _IOW('v',24, struct video_play_mode) /* Set output video mode/feature */
+#define VIDIOCSWRITEMODE _IOW('v',25, int) /* Set write mode */
+#define VIDIOCGPLAYINFO _IOR('v',26, struct video_info) /* Get current playback info from hardware */
+#define VIDIOCSMICROCODE _IOW('v',27, struct video_code) /* Load microcode into hardware */
+#define VIDIOCGVBIFMT _IOR('v',28, struct vbi_format) /* Get VBI information */
+#define VIDIOCSVBIFMT _IOW('v',29, struct vbi_format) /* Set VBI information */
+
+
+#define BASE_VIDIOCPRIVATE 192 /* 192-255 are private */
+
+/* VIDIOCSWRITEMODE */
+#define VID_WRITE_MPEG_AUD 0
+#define VID_WRITE_MPEG_VID 1
+#define VID_WRITE_OSD 2
+#define VID_WRITE_TTX 3
+#define VID_WRITE_CC 4
+#define VID_WRITE_MJPEG 5
+
+/* VIDIOCSPLAYMODE */
+#define VID_PLAY_VID_OUT_MODE 0
+ /* p1: = VIDEO_MODE_PAL, VIDEO_MODE_NTSC, etc ... */
+#define VID_PLAY_GENLOCK 1
+ /* p1: 0 = OFF, 1 = ON */
+ /* p2: GENLOCK FINE DELAY value */
+#define VID_PLAY_NORMAL 2
+#define VID_PLAY_PAUSE 3
+#define VID_PLAY_SINGLE_FRAME 4
+#define VID_PLAY_FAST_FORWARD 5
+#define VID_PLAY_SLOW_MOTION 6
+#define VID_PLAY_IMMEDIATE_NORMAL 7
+#define VID_PLAY_SWITCH_CHANNELS 8
+#define VID_PLAY_FREEZE_FRAME 9
+#define VID_PLAY_STILL_MODE 10
+#define VID_PLAY_MASTER_MODE 11
+ /* p1: see below */
+#define VID_PLAY_MASTER_NONE 1
+#define VID_PLAY_MASTER_VIDEO 2
+#define VID_PLAY_MASTER_AUDIO 3
+#define VID_PLAY_ACTIVE_SCANLINES 12
+ /* p1 = first active; p2 = last active */
+#define VID_PLAY_RESET 13
+#define VID_PLAY_END_MARK 14
+
+
+#endif /* __LINUX_VIDEODEV_H */
+
+/*
+ * Local variables:
+ * c-basic-offset: 8
+ * End:
+ */
diff --git a/community/python-yaml/PKGBUILD b/community/python-yaml/PKGBUILD
index 8713f5f1e..fb2af475a 100644
--- a/community/python-yaml/PKGBUILD
+++ b/community/python-yaml/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 44092 2011-04-02 08:52:49Z spupykin $
+# $Id: PKGBUILD 49808 2011-06-21 09:01:51Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Contributor: Michal Bozon <michal.bozon__at__gmail.com>
pkgbase=python-yaml
pkgname=(python2-yaml python-yaml)
-pkgver=3.09
-pkgrel=3
+pkgver=3.10
+pkgrel=1
pkgdesc="Python bindings for YAML, using fast libYAML library"
arch=('i686' 'x86_64' 'mips64el')
url="http://pyyaml.org"
@@ -13,7 +13,7 @@ license=('MIT')
makedepends=('python' 'python2' 'libyaml')
install='python-yaml.install'
source=(http://pyyaml.org/download/pyyaml/PyYAML-$pkgver.tar.gz)
-md5sums=('f219af2361e87fdc5e85e95b84c11d87')
+md5sums=('74c94a383886519e9e7b3dd1ee540247')
build() {
true
diff --git a/community/qtcreator/PKGBUILD b/community/qtcreator/PKGBUILD
index 20a74f4cf..410a7e18c 100644
--- a/community/qtcreator/PKGBUILD
+++ b/community/qtcreator/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 48989 2011-06-09 09:28:42Z svenstaro $
+# $Id: PKGBUILD 49861 2011-06-21 12:55:45Z svenstaro $
# Maintainer: Imanol Celaya <ornitorrincos@archlinux-es.org>
# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
# Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com>
@@ -10,8 +10,8 @@ pkgbase=qtcreator
# artisticstyle plugin does currently not support qtcreator 2.2.0
#pkgname=('qtcreator' 'qtcreator-todo-plugin' 'qtcreator-artisticstyle-plugin')
pkgname=('qtcreator' 'qtcreator-todo-plugin')
-pkgver=2.2.0
-pkgrel=3
+pkgver=2.2.1
+pkgrel=1
pkgdesc='Lightweight, cross-platform integrated development environment'
arch=('i686' 'x86_64' 'mips64el')
url='http://qt.nokia.com/products/developer-tools'
@@ -23,7 +23,7 @@ source=("http://get.qt.nokia.com/qtcreator/qt-creator-${pkgver}-src.tar.gz"
'http://download.berlios.de/astyleplugin/ArtisticStylePlugin-0.6-src.zip'
"https://gitorious.org/qt-creator-todo-plugin/qt-creator-todo-plugin/archive-tarball/88f8fc50"
'qtcreator.desktop')
-md5sums=('4e02382db7b850f3a3b20c6a8707269e'
+md5sums=('35d74837e48b12ee58379e1c029a9a6c'
'4dab1bb07ba5c39ae4c975a333d32ec1'
'734a6f375e595de796f9802087845dfe'
'2c3ffbd66845b37be9804f2966815a10')
diff --git a/community/redis/PKGBUILD b/community/redis/PKGBUILD
index 1dbb52f23..58c498abd 100644
--- a/community/redis/PKGBUILD
+++ b/community/redis/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 48128 2011-05-28 22:25:50Z tdziedzic $
+# $Id: PKGBUILD 49856 2011-06-21 12:25:02Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Maintainer: Jan-Erik Rediger <badboy at archlinux dot us>
# Contributor: nofxx <x@<nick>.com>
pkgname=redis
-pkgver=2.2.8
+pkgver=2.2.10
pkgrel=1
pkgdesc="Advanced key-value store"
arch=('i686' 'x86_64' 'mips64el')
@@ -18,7 +18,7 @@ backup=("etc/redis.conf"
source=("http://redis.googlecode.com/files/${pkgname}-${pkgver}.tar.gz"
"redis.d"
"redis.logrotate")
-md5sums=('106af5e3d4646588fd27be499227e14c'
+md5sums=('5b08ea64334b7a59df2c25ad7e42de7e'
'bf61968d18d0e42529880f5c488ea9ed'
'9e2d75b7a9dc421122d673fe520ef17f')
diff --git a/community/tracker/PKGBUILD b/community/tracker/PKGBUILD
index 77e396cf3..70aa386f9 100644
--- a/community/tracker/PKGBUILD
+++ b/community/tracker/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 48893 2011-06-07 11:06:49Z spupykin $
+# $Id: PKGBUILD 49818 2011-06-21 09:19:30Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Maintainer: Alexander Fehr <pizzapunk gmail com>
pkgname=tracker
-pkgver=0.10.16
+pkgver=0.10.18
pkgrel=1
pkgdesc="Powerful object database, tag/metadata database, search tool and indexer"
arch=('i686' 'x86_64' 'mips64el')
@@ -25,7 +25,7 @@ conflicts=('libtracker')
provides=("libtracker")
install=tracker.install
source=(http://ftp.gnome.org/pub/GNOME/sources/tracker/0.10/tracker-$pkgver.tar.bz2)
-md5sums=('5be2bdb5ee20d3e9a15c6e6649a733f7')
+md5sums=('571b915d0173d9d5f2e3310ffd02e8e6')
build() {
cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/ushare/PKGBUILD b/community/ushare/PKGBUILD
index f790de240..c8df085e1 100644
--- a/community/ushare/PKGBUILD
+++ b/community/ushare/PKGBUILD
@@ -1,27 +1,25 @@
-# $Id: PKGBUILD 41581 2011-03-08 01:32:14Z giovanni $
+# $Id: PKGBUILD 49823 2011-06-21 09:38:58Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Maintainer: Kessia 'even' Pinheiro <kessiapinheiro at gmail.com>
# Contributor: kastor <kastor@fobos.org.ar>
pkgname=ushare
pkgver=1.1a
-pkgrel=10
+pkgrel=12
pkgdesc="A free UPnP A/V Media Server for Linux"
url="http://ushare.geexbox.org"
license=('GPL2')
arch=('i686' 'x86_64' 'mips64el')
depends=('libupnp' 'libdlna')
-backup=(etc/ushare/ushare.conf)
+backup=('etc/ushare/ushare.conf'
+ 'etc/conf.d/ushare')
+install=ushare.install
source=("http://ushare.geexbox.org/releases/${pkgname}-${pkgver}.tar.bz2"
"ushare"
"upnp-build-fix.patch"
"ushare-config.patch")
md5sums=('5bbcdbf1ff85a9710fa3d4e82ccaa251'
- 'f252120bcd4362ed64111239d358851c'
- '32c29f9f673e8b3a3d9e7bf5e60febbc'
- '5243475c0cebc5db49296b2f3691085b')
-md5sums=('5bbcdbf1ff85a9710fa3d4e82ccaa251'
- 'f252120bcd4362ed64111239d358851c'
+ '5b8d5ab953dba09f05abd38abef063de'
'32c29f9f673e8b3a3d9e7bf5e60febbc'
'5243475c0cebc5db49296b2f3691085b')
@@ -38,11 +36,18 @@ build() {
--enable-dlna --with-libdlna-dir=/usr/include/libavformat
make
+}
+
+package() {
+ cd ${srcdir}/${pkgname}-${pkgver}
make DESTDIR=${pkgdir} install
rm -rf ${pkgdir}/etc/${pkgname}/init.d
install -m 0755 -D ${srcdir}/ushare ${pkgdir}/etc/rc.d/ushare
install -d -m 0755 ${pkgdir}/etc/conf.d/
- echo "PARAMS=" > ${pkgdir}/etc/conf.d/ushare
+ cat >${pkgdir}/etc/conf.d/ushare <<EOF
+#PARAMS="-c /tmp -i eth0"
+PARAMS=
+EOF
install -D -m0644 src/ushare.1 $pkgdir/usr/share/man/man1/ushare.1
}
diff --git a/community/ushare/ushare b/community/ushare/ushare
index 0e920ae0a..0770d16b9 100755
--- a/community/ushare/ushare
+++ b/community/ushare/ushare
@@ -23,7 +23,7 @@ PID=`pidof -o %PPID /usr/bin/ushare`
case "$1" in
start)
stat_busy "Starting $DESC"
- [ -z "$PID" ] && /usr/bin/ushare -D -x $PARAMS
+ [ -z "$PID" ] && sudo -u ushare /usr/bin/ushare -D -x $PARAMS
if [ $? -gt 0 ]; then
stat_fail
else
diff --git a/community/ushare/ushare.install b/community/ushare/ushare.install
new file mode 100644
index 000000000..c51ea621d
--- /dev/null
+++ b/community/ushare/ushare.install
@@ -0,0 +1,16 @@
+post_install() {
+ if [ -z "`grep '^ushare:' /etc/group`" ]; then
+ groupadd ushare
+ fi
+ if [ -z "`grep '^ushare:' /etc/passwd`" ]; then
+ useradd -d /var/empty -g ushare -s /bin/false ushare
+ fi
+}
+
+post_upgrade() {
+ post_install $1
+}
+
+post_remove() {
+ userdel ushare
+}
diff --git a/extra/audacious/PKGBUILD b/extra/audacious/PKGBUILD
index 833881841..0c630fdcd 100644
--- a/extra/audacious/PKGBUILD
+++ b/extra/audacious/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 124404 2011-05-20 15:01:13Z bisson $
+# $Id: PKGBUILD 128038 2011-06-21 06:55:54Z bisson $
# Contributor: Alexander Fehr <pizzapunk gmail com>
# Contributor: Giovanni Scafora <giovanni@archlinux.org>
# Maintainer: Gaetan Bisson <bisson@archlinux.org>
pkgname=audacious
-pkgver=2.5.1
+pkgver=2.5.2
pkgrel=1
pkgdesc='Lightweight, GTK2-based advanced audio player focused on audio quality'
arch=('i686' 'x86_64' 'mips64el')
@@ -12,8 +12,8 @@ url='http://audacious-media-player.org/'
license=('GPL3')
depends=('gtk2' 'libmcs' 'dbus-glib' 'libguess' 'audacious-plugins' 'desktop-file-utils' 'hicolor-icon-theme')
optdepends=('unzip: zipped skins support')
-source=("http://distfiles.atheme.org/$pkgname-$pkgver.tgz")
-sha1sums=('886e1cde03069b3dee15a6df04e3e8f5934018f1')
+source=("http://distfiles.atheme.org/$pkgname-$pkgver.tar.gz")
+sha1sums=('48b2662d1513959479ae561465b41df08369a689')
provides=('audacious-player')
replaces=('audacious-player')
diff --git a/extra/exiv2/PKGBUILD b/extra/exiv2/PKGBUILD
index 6a45eaac8..741597dfe 100644
--- a/extra/exiv2/PKGBUILD
+++ b/extra/exiv2/PKGBUILD
@@ -1,9 +1,9 @@
-#$Id: PKGBUILD 110922 2011-02-23 07:38:47Z eric $
+#$Id: PKGBUILD 128049 2011-06-21 07:56:57Z eric $
# Maintainer: tobias <tobias@arhlinux.org>
pkgname=exiv2
pkgver=0.21.1
-pkgrel=1
+pkgrel=2
pkgdesc="Exif and Iptc metadata manipulation library and tools."
arch=('i686' 'x86_64' 'mips64el')
url="http://exiv2.org"
@@ -16,7 +16,7 @@ sha1sums=('d33e0efbad5d6a7af7f2e6d1d0beb6e7c941cfca')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
- ./configure --prefix=/usr
+ CPPFLAGS="-D_FILE_OFFSET_BITS=64" ./configure --prefix=/usr
make
}
diff --git a/extra/farsight2/PKGBUILD b/extra/farsight2/PKGBUILD
index a93979c58..d8e765fb5 100644
--- a/extra/farsight2/PKGBUILD
+++ b/extra/farsight2/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 124193 2011-05-17 15:41:27Z ibiru $
+# $Id: PKGBUILD 128061 2011-06-21 14:53:16Z ibiru $
# Maintainer: Ionut Biru <ibiru@archlinux.org>
# Contributor: William Díaz <wdiaz@archlinux.us>
pkgname=farsight2
-pkgver=0.0.28
-pkgrel=2
+pkgver=0.0.29
+pkgrel=1
pkgdesc="Audio/Video conference software for Instant Messengers"
arch=('i686' 'x86_64' 'mips64el')
url="http://farsight.freedesktop.org"
@@ -13,7 +13,7 @@ depends=('libnice' 'gstreamer0.10-base-plugins' 'gstreamer0.10-good' 'gstreamer0
optdepends=('gstreamer0.10-ugly-plugins: h264 codec')
options=('!libtool' '!emptydirs')
source=(http://farsight.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('38767e775067270754a32aaf8e3a7db1')
+md5sums=('276076f65b70236d981c288413572168')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/ffmpeg/PKGBUILD b/extra/ffmpeg/PKGBUILD
index 1bd7fc9b4..6d1e06693 100644
--- a/extra/ffmpeg/PKGBUILD
+++ b/extra/ffmpeg/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id$
+# $Id: PKGBUILD 122938 2011-05-07 11:51:04Z ibiru $
# Maintainer : Ionut Biru <ibiru@archlinux.org>
# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
# Contributor: Paul Mattal <paul@archlinux.org>
diff --git a/extra/ffmpeg/avutils-make-aes-and-sha-public.patch b/extra/ffmpeg/avutils-make-aes-and-sha-public.patch
new file mode 100644
index 000000000..ac10e4f4a
--- /dev/null
+++ b/extra/ffmpeg/avutils-make-aes-and-sha-public.patch
@@ -0,0 +1,37 @@
+From a3a0af4fb1237bed0af75868073f9a63db8b1864 Mon Sep 17 00:00:00 2001
+From: Alexis Ballier <aballier@gentoo.org>
+Date: Thu, 7 Apr 2011 10:19:23 -0300
+Subject: [PATCH] avutil: make aes and sha api public
+
+The functions are already av_ prefixed and sha1 header is already provided.
+Install libavutil/{aes,sha}.h
+
+Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
+Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
+---
+ libavutil/Makefile | 2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/libavutil/Makefile b/libavutil/Makefile
+index 300acb1..baee496 100644
+--- a/libavutil/Makefile
++++ b/libavutil/Makefile
+@@ -3,6 +3,7 @@ include $(SUBDIR)../config.mak
+ NAME = avutil
+
+ HEADERS = adler32.h \
++ aes.h \
+ attributes.h \
+ audioconvert.h \
+ avassert.h \
+@@ -33,6 +34,7 @@ HEADERS = adler32.h \
+ random_seed.h \
+ rational.h \
+ samplefmt.h \
++ sha.h \
+ sha1.h \
+
+ BUILT_HEADERS = avconfig.h
+--
+1.7.2.5
+
diff --git a/extra/postgresql-old-upgrade/PKGBUILD b/extra/postgresql-old-upgrade/PKGBUILD
new file mode 100644
index 000000000..aeceaaaa6
--- /dev/null
+++ b/extra/postgresql-old-upgrade/PKGBUILD
@@ -0,0 +1,47 @@
+# $Id: PKGBUILD 128097 2011-06-21 19:32:41Z dan $
+# Maintainer: Dan McGee <dan@archlinux.org>
+
+pkgname=postgresql-old-upgrade
+pkgver=8.4.8
+_majorver=${pkgver%.*}
+pkgrel=1
+pkgdesc="Minimal PostgreSQL build for migrating between major versions with pg_upgrade"
+arch=('i686' 'x86_64')
+url="http://www.postgresql.org/"
+license=('custom:PostgreSQL')
+depends=("postgresql-libs>=${_majorver}" 'libxml2' 'openssl>=1.0.0')
+source=(ftp://ftp.postgresql.org/pub/source/v${pkgver}/postgresql-${pkgver}.tar.bz2
+ build.patch)
+
+build() {
+ cd "${srcdir}/postgresql-${pkgver}"
+
+ # patch to remove regress/test make target (won't build with it present)
+ patch -Np1 -i ../build.patch
+
+ ./configure --prefix=/opt/pgsql-${_majorver} \
+ --with-libxml --with-openssl --without-perl \
+ --without-python --with-pam --without-readline \
+ --with-system-tzdata=/usr/share/zoneinfo --disable-nls \
+ --enable-thread-safety
+
+ make -C src all
+}
+
+package() {
+ cd "${srcdir}/postgresql-${pkgver}"
+
+ # install
+ make DESTDIR="${pkgdir}" -C src install
+
+ # install license
+ install -D -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+
+ # clean up unneeded installed items
+ rm -rf "${pkgdir}/opt/pgsql-${_majorver}/include/"
+}
+
+md5sums=('4603e8ea30cee97189b62b39022f2043'
+ '4d74f4227dc5e12bf95b3490758d86c9')
+sha256sums=('3e90ef2a86a9f4831e21ff4a574fbfb8e1b8c097af637c93ec43c64c684a0938'
+ '1f020ae1d921a6f47e4889c2026c5ef69879d204e14aeac9330f89b7e6088348')
diff --git a/extra/postgresql-old-upgrade/build.patch b/extra/postgresql-old-upgrade/build.patch
new file mode 100644
index 000000000..c8f665d12
--- /dev/null
+++ b/extra/postgresql-old-upgrade/build.patch
@@ -0,0 +1,11 @@
+diff -Naur postgresql-8.2.3-orig/src/Makefile postgresql-8.2.3/src/Makefile
+--- postgresql-8.2.3-orig/src/Makefile 2006-06-22 16:50:35.000000000 -0700
++++ postgresql-8.2.3/src/Makefile 2007-03-05 10:46:24.000000000 -0800
+@@ -23,7 +23,6 @@
+ $(MAKE) -C bin $@
+ $(MAKE) -C pl $@
+ $(MAKE) -C makefiles $@
+- $(MAKE) -C test/regress $@
+
+ install: install-local
+
diff --git a/extra/strigi/PKGBUILD b/extra/strigi/PKGBUILD
index 63e1713ed..4b7aa5d94 100644
--- a/extra/strigi/PKGBUILD
+++ b/extra/strigi/PKGBUILD
@@ -1,19 +1,18 @@
-# $Id: PKGBUILD 127981 2011-06-20 14:56:52Z andrea $
+# $Id: PKGBUILD 128044 2011-06-21 07:08:33Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Tobias Powalowski <tpowa@archlinux.org>
pkgname=strigi
pkgver=0.7.5
-pkgrel=2
+pkgrel=3
pkgdesc="Fast crawling desktop search engine with Qt4 GUI"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.vandenoever.info/software/strigi/"
license=('GPL2')
-depends=('qt' 'bzip2' 'exiv2' 'libxml2')
-makedepends=('cmake' 'pkg-config')
+depends=('bzip2' 'exiv2' 'libxml2' 'boost-libs')
+makedepends=('qt' 'cmake' 'pkg-config' 'boost')
source=("http://www.vandenoever.info/software/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
md5sums=('0559e2ab65d187d30916e9ffe36e0fb6')
-options=('!libtool')
build() {
cd "${srcdir}"
@@ -25,18 +24,20 @@ build() {
-DENABLE_INOTIFY=ON \
-DENABLE_LOG4CXX=OFF \
-DENABLE_FAM=OFF \
- -DENABLE_CLUCENE=OFF
+ -DENABLE_CLUCENE=OFF \
+ -DENABLE_CLUCENE_NG=OFF \
+ -DENABLE_FFMPEG=OFF \
+ -DENABLE_XINE=OFF
make
}
package() {
- cd "${srcdir}/build"
+ cd "${srcdir}/build/libstreams"
make DESTDIR="${pkgdir}" install
- # strigidaemon isn't needed
- rm -r "${pkgdir}"/usr/bin/{strigicmd,strigidaemon}
- rm -r "${pkgdir}"/usr/include/strigi/{asyncsocketclient,asyncsocket,clientinterface,socketclient}.h
- rm -r "${pkgdir}"/usr/lib/libsearchclient.so{,.0,.0.7.5}
- rm -r "${pkgdir}"/usr/lib/libsearchclient/LibSearchClientConfig.cmake
- rm -r "${pkgdir}"/usr/share/dbus-1/services/{org.freedesktop.xesam.searcher,vandenoever.strigi}.service
+ cd "${srcdir}/build/libstreamanalyzer"
+ make DESTDIR="${pkgdir}" install
+
+ cd "${srcdir}/build/strigiutils"
+ make DESTDIR="${pkgdir}" install
}
diff --git a/extra/telepathy-farsight/PKGBUILD b/extra/telepathy-farsight/PKGBUILD
index ebc6f52b3..b72920f75 100644
--- a/extra/telepathy-farsight/PKGBUILD
+++ b/extra/telepathy-farsight/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 124113 2011-05-16 16:15:50Z ibiru $
+# $Id: PKGBUILD 128060 2011-06-21 14:52:50Z ibiru $
# Maintainer: Ionut Biru <ibiru@archlinux.org>
# Contributor: Ju Liu <liuju86 at gmail dot com>
# Contributor: Denis Zawada <deno@rootnode.net>
pkgname=telepathy-farsight
-pkgver=0.0.18
+pkgver=0.0.19
pkgrel=1
pkgdesc="A telepathy-backend to use stream engine."
arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ depends=('telepathy-glib' 'farsight2')
makedepends=('libxslt' 'python2')
options=('!libtool')
source=(http://telepathy.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('984be4153c635ca1b2010de27d74eff4')
+md5sums=('6bacc22aaec00823f3bbce8517600ec3')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/telepathy-glib/PKGBUILD b/extra/telepathy-glib/PKGBUILD
index f37422b8e..29cef1a5e 100644
--- a/extra/telepathy-glib/PKGBUILD
+++ b/extra/telepathy-glib/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 126144 2011-06-01 19:05:33Z ibiru $
+# $Id: PKGBUILD 128070 2011-06-21 15:42:15Z ibiru $
# Maintainer: Ionut Biru <ibiru@archlinux.org>
# Contributor: Kessia 'even' Pinheiro <kessiapinheiro at gmail.com
# Contributor: Bjorn Lindeijer <bjorn lindeijer nl>
pkgname=telepathy-glib
-pkgver=0.14.7
+pkgver=0.14.8
pkgrel=1
pkgdesc="GLib bindings for the Telepathy D-Bus protocol"
arch=('i686' 'x86_64' 'mips64el')
@@ -14,7 +14,7 @@ options=('!libtool' '!emptydirs')
depends=('dbus-glib')
makedepends=('libxslt' 'vala' 'gobject-introspection')
source=("http://telepathy.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('3230f7389cd3a0ebe4436eb1f7e40c18')
+md5sums=('07dae468cd6b55a2bddbd0b3c80f3796')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/xulrunner/PKGBUILD b/extra/xulrunner/PKGBUILD
index 1196fd176..1f3cd5e44 100644
--- a/extra/xulrunner/PKGBUILD
+++ b/extra/xulrunner/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 126161 2011-06-01 20:45:14Z ibiru $
+# $Id: PKGBUILD 128075 2011-06-21 17:45:36Z ibiru $
# Maintainer: Jan de Groot <jgc@archlinux.org>
# Contributor: Alexander Baldeck <alexander@archlinux.org>
pkgname=xulrunner
pkgver=2.0.1
_ffoxver=4.0.1
-pkgrel=2
+pkgrel=3
pkgdesc="Mozilla Runtime Environment"
arch=('i686' 'x86_64' 'mips64el')
license=('MPL' 'GPL' 'LGPL')
@@ -19,27 +19,27 @@ source=(http://ftp.gnu.org/gnu/gnuzilla/${_ffoxver}/icecat-${_ffoxver}.tar.xz
port_gnomevfs_to_gio.patch
mips.patch)
options=('!emptydirs')
-
+replaces=('xulrunner-oss')
build() {
cd "${srcdir}/icecat-${_ffoxver}/"
-# cp "${srcdir}/mozconfig" .mozconfig
+ cp "${srcdir}/mozconfig" .mozconfig
#fix libdir/sdkdir - fedora
-# patch -Np1 -i "${srcdir}/mozilla-pkgconfig.patch"
+ patch -Np1 -i "${srcdir}/mozilla-pkgconfig.patch"
#Force installation to the same path for every version
-# patch -Np1 -i "${srcdir}/xulrunner-version.patch"
+ patch -Np1 -i "${srcdir}/xulrunner-version.patch"
#https://bugzilla.mozilla.org/show_bug.cgi?id=620931
-# patch -Np1 -i "${srcdir}/xulrunner-omnijar.patch"
+ patch -Np1 -i "${srcdir}/xulrunner-omnijar.patch"
#https://bugzilla.mozilla.org/show_bug.cgi?id=494163
-# patch -Np1 -i "${srcdir}/port_gnomevfs_to_gio.patch"
+ patch -Np1 -i "${srcdir}/port_gnomevfs_to_gio.patch"
-# [[ "$CARCH" == "mips64el" ]] && {
-# echo "ac_add_options --disable-ipc" >> .mozconfig
-# patch -Np0 -i "${srcdir}/mips.patch"
-# }
+ [[ "$CARCH" == "mips64el" ]] && {
+ echo "ac_add_options --disable-ipc" >> .mozconfig
+ patch -Np0 -i "${srcdir}/mips.patch"
+ }
unset CFLAGS
unset CXXFLAGS
@@ -62,10 +62,3 @@ package() {
install -d ${pkgdir}/etc/ld.so.conf.d
echo "/usr/lib/xulrunner-2.0" > ${pkgdir}/etc/ld.so.conf.d/xulrunner.conf
}
-md5sums=('1b4d44ee5badc28fd332cba564ecde0a'
- '2358a2ddd35bcdd62ff42442dfe548d9'
- '639ea80e823543dd415b90c0ee804186'
- 'a0236f6c3e55f60b7888d8cf137ff209'
- 'f8b64cf798636a9c1e4e10c08de0b859'
- '42f83468b296452fb754a81a4317ca64'
- '0e970ff5600246e953f527813883e744')
diff --git a/libre/libquicktime-libre/PKGBUILD b/libre/libquicktime-libre/PKGBUILD
new file mode 100644
index 000000000..c6e4ab588
--- /dev/null
+++ b/libre/libquicktime-libre/PKGBUILD
@@ -0,0 +1,34 @@
+# $Id$
+# Maintainer: Mateusz Herych <heniekk@gmail.com>
+
+pkgname=libquicktime-libre
+_pkgname=libquicktime
+pkgver=1.2.2
+pkgrel=3
+pkgdesc="A library for reading and writing quicktime files (no unfree faac support)."
+arch=('i686' 'x86_64')
+license=('GPL')
+url="http://libquicktime.sourceforge.net/"
+depends=('gtk2' 'ffmpeg' 'alsa-lib' 'libxv' 'libgl' 'libxaw' 'x264' 'faad2')
+options=('!libtool')
+source=(http://downloads.sourceforge.net/sourceforge/$_pkgname/$_pkgname-$pkgver.tar.gz)
+sha256sums=('a83ddaaeaf98231d9f224190dcb8810ebdabd3edb5c8cebe2fb083d25edb7436')
+provides=("$_pkgname=$pkgver")
+conflicts=($_pkgname)
+replaces=($_pkgname)
+
+build() {
+ cd "$srcdir/$_pkgname-$pkgver"
+ ./configure --prefix=/usr \
+ --enable-gpl \
+ --with-ffmpeg \
+ --with-x264 \
+ --without-doxygen
+ make
+}
+
+package() {
+ cd $srcdir/$_pkgname-$pkgver
+ make DESTDIR="$pkgdir" install
+}
+
diff --git a/libre/mplayer-libre/PKGBUILD b/libre/mplayer-libre/PKGBUILD
index 238fa973b..c3b4a0830 100644
--- a/libre/mplayer-libre/PKGBUILD
+++ b/libre/mplayer-libre/PKGBUILD
@@ -1,59 +1,77 @@
-# $Id$
+# $Id: PKGBUILD 128080 2011-06-21 18:32:19Z ibiru $
# Maintainer : Ionut Biru <ibiru@archlinux.org>
# Contributor: Hugo Doria <hugo@archlinux.org>
-# Maintainer for Parabola GNU/Linux: Omar Botta <omarbotta@gnulinuxlibre.net>
-pkgname=mplayer-libre
-pkgver=33159
+_pkgbase=mplayer
+pkgbase=mplayer-libre
+pkgname=('mplayer-libre' 'mencoder-libre')
+pkgver=33690
pkgrel=1
-pkgdesc="A movie player for linux. Libre version without faac."
arch=('i686' 'x86_64')
-depends=('libxxf86dga' 'libxxf86vm' 'libmad' 'cdparanoia' 'libxinerama' 'sdl' 'lame' 'libtheora' 'xvidcore' 'libmng' 'libxss'
- 'libgl' 'smbclient' 'aalib' 'jack' 'libcaca' 'x264' 'lirc-utils' 'ttf-dejavu' 'libxvmc' 'enca' 'libvdpau'
- 'opencore-amr' 'libdca' 'a52dec' 'schroedinger' 'libvpx' 'libpulse' 'speex' 'fribidi' 'desktop-file-utils')
+makedepends=('libxxf86dga' 'libxxf86vm' 'libmad' 'cdparanoia' 'libxinerama' 'sdl' 'lame' 'libtheora' 'xvidcore' 'libmng' 'libxss' 'libgl' 'smbclient'
+'aalib' 'jack' 'libcaca' 'x264' 'faad2' 'lirc-utils' 'libxvmc' 'enca' 'libvdpau' 'opencore-amr' 'libdca' 'a52dec' 'schroedinger' 'libvpx'
+'libpulse' 'fribidi' 'unzip' 'mesa' 'live-media' 'yasm' 'git' 'fontconfig')
license=('GPL')
url="http://www.mplayerhq.hu/"
-makedepends=('unzip' 'mesa' 'live-media' 'yasm' 'git')
-backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf')
-source=(ftp://ftp.archlinux.org/other/${pkgname%-libre}/${pkgname%-libre}-${pkgver}.tar.xz mplayer.desktop mplayer.png)
-provides=("mplayer=$pkgver")
-conflicts=('mplayer')
-replaces=('mplayer')
-md5sums=('caedcdc1e50b5575c38c2a85f9c53afc'
- '647b9f4ab5284a7fef3f84f992214e77'
- 'd00874ccc644b7f43d6ef1c942fcef28')
+options=(!buildflags !emptydirs !distcc)
+source=(ftp://ftp.archlinux.org/other/${_pkgbase}/${_pkgbase}-${pkgver}.tar.xz mplayer.desktop)
+md5sums=('7efa332d381a1461f8518730f8c52e4d'
+ 'c0d6ef795cf6de48e3b87ff7c23f0319')
build() {
- # Custom CFLAGS break the mplayer build
- unset CFLAGS LDFLAGS
-
- cd ${srcdir}/${pkgname%-libre}
-
- ./configure --prefix=/usr \
- --enable-runtime-cpudetection \
- --disable-gui \
- --disable-arts \
- --disable-liblzo \
- --enable-speex \
- --disable-openal \
- --disable-libdv \
- --disable-musepack \
- --disable-esd \
- --disable-mga \
- --disable-faac \
- --enable-xvmc \
- --language=all \
- --confdir=/etc/mplayer
-
- [ "$CARCH" = "i686" ] && sed 's|-march=i486|-march=i686|g' -i config.mak
-
- make
- make -j1 DESTDIR=${pkgdir} install
- install -Dm644 etc/{codecs.conf,input.conf,example.conf} ${pkgdir}/etc/mplayer/
- install -dm755 ${pkgdir}/usr/share/mplayer/
- ln -s /usr/share/fonts/TTF/DejaVuSans.ttf ${pkgdir}/usr/share/mplayer/subfont.ttf
- rm -rf ${pkgdir}/usr/share/mplayer/font
- #desktop file FS#14770
- install -Dm644 ${srcdir}/mplayer.desktop ${pkgdir}/usr/share/applications/mplayer.desktop
- install -Dm644 ${srcdir}/mplayer.png ${pkgdir}/usr/share/pixmaps/mplayer.png
+ cd ${srcdir}/${_pkgbase}
+
+ ./configure --prefix=/usr \
+ --enable-runtime-cpudetection \
+ --disable-gui \
+ --disable-arts \
+ --disable-liblzo \
+ --disable-speex \
+ --disable-openal \
+ --disable-libdv \
+ --disable-musepack \
+ --disable-esd \
+ --disable-mga \
+ --enable-xvmc \
+ --language=all \
+ --confdir=/etc/mplayer
+ [ "$CARCH" = "i686" ] && sed 's|-march=i486|-march=i686|g' -i config.mak
+
+ make
+}
+
+package_mplayer-libre() {
+ pkgdesc="A movie player for linux (no unfree faac support)"
+ install=mplayer.install
+ backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf')
+ depends=('desktop-file-utils' 'ttf-dejavu' 'enca' 'libxss' 'a52dec' 'libvpx' 'lirc-utils' 'x264' 'libmng' 'libdca' 'aalib' 'lame' 'fontconfig' 'libgl'
+ 'libxinerama' 'libvdpau' 'libpulse' 'smbclient' 'xvidcore' 'opencore-amr' 'jack' 'cdparanoia' 'libmad' 'sdl' 'libtheora' 'libcaca' 'libxxf86dga' 'fribidi'
+ 'libjpeg' 'faad2' 'libxvmc' 'schroedinger')
+ provides=("mplayer=$pkgver")
+ replaces=('mplayer')
+ conflicts=('mplayer')
+
+ cd ${srcdir}/${_pkgbase}
+
+ make DESTDIR=${pkgdir} install-mplayer install-mplayer-man
+ install -Dm644 etc/{codecs.conf,input.conf,example.conf} ${pkgdir}/etc/mplayer/
+ install -dm755 ${pkgdir}/usr/share/mplayer/
+ ln -s /usr/share/fonts/TTF/DejaVuSans.ttf ${pkgdir}/usr/share/mplayer/subfont.ttf
+ rm -rf ${pkgdir}/usr/share/mplayer/font
+ #desktop file FS#14770
+ install -Dm644 ${srcdir}/mplayer.desktop ${pkgdir}/usr/share/applications/mplayer.desktop
+ install -Dm644 etc/mplayer.png ${pkgdir}/usr/share/pixmaps/mplayer.png
+}
+
+package_mencoder-libre() {
+ pkgdesc="Free command line video decoding, encoding and filtering tool (without unfree faac support)"
+ depends=('enca' 'a52dec' 'libvpx' 'x264' 'libmng' 'libdca' 'bzip2' 'lame' 'alsa-lib' 'fontconfig' 'giflib' 'libpng' 'smbclient' 'xvidcore' 'opencore-amr' 'cdparanoia'
+ 'libmad' 'libtheora' 'fribidi' 'libjpeg' 'faad2' 'schroedinger')
+ provides=("mencoder=$pkgver")
+ replaces=('mencoder')
+ conflicts=('mencoder')
+
+ cd ${srcdir}/${_pkgbase}
+ make DESTDIR=${pkgdir} install-mencoder install-mencoder-man
+ find $pkgdir/usr/share/man -name 'mplayer.1' -exec bash -c 'mv "$1" "${1/mplayer/mencoder}"' _ {} \;
}
diff --git a/libre/mplayer-libre/mplayer.desktop b/libre/mplayer-libre/mplayer.desktop
index e3229d042..07acea13f 100644
--- a/libre/mplayer-libre/mplayer.desktop
+++ b/libre/mplayer-libre/mplayer.desktop
@@ -14,7 +14,7 @@ Comment[zh]=多媒体播放器
Comment[pl]=Odtwarzaj filmy i muzykę
Icon=mplayer
TryExec=mplayer
-Exec=mplayer -really-quiet %F
+Exec=mplayer %F
Terminal=false
NoDisplay=true
Categories=GTK;AudioVideo;Audio;Video;Player;TV;
diff --git a/multilib-testing/lib32-glibc/PKGBUILD b/multilib-testing/lib32-glibc/PKGBUILD
index e1ed19461..59e7e0d74 100644
--- a/multilib-testing/lib32-glibc/PKGBUILD
+++ b/multilib-testing/lib32-glibc/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 49129 2011-06-11 13:29:12Z heftig $
+# $Id: PKGBUILD 49882 2011-06-21 19:12:48Z heftig $
# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
# Contributor: Jan de Groot <jgc@archlinux.org>
# Contributor: Allan McRae <allan@archlinux.org>
@@ -9,8 +9,8 @@
_pkgbasename=glibc
pkgname=lib32-$_pkgbasename
pkgver=2.14
-pkgrel=2
-_glibcdate=20110605
+pkgrel=3
+_glibcdate=20110617
pkgdesc="GNU C Library for multilib"
arch=('x86_64')
url="http://www.gnu.org/software/libc"
@@ -26,9 +26,11 @@ source=(http://mirrors.kernel.org/archlinux/other/glibc/${_pkgbasename}-${pkgver
glibc-2.12.2-ignore-origin-of-privileged-program.patch
glibc-2.13-futex.patch
glibc-2.14-libdl-crash.patch
- glibc-2.14-revert-4462fad3.patch
+ glibc-2.14-fix-resolver-crash-typo.patch
+ glibc-2.14-reexport-rpc-interface.patch
+ glibc-2.14-reinstall-nis-rpc-headers.patch
lib32-glibc.conf)
-md5sums=('a96742599fc8a99e52b9e344f39a1000'
+md5sums=('e441d745609d93c907b72548ba646dad'
'4dadb9203b69a3210d53514bb46f41c3'
'0c5540efc51c0b93996c51b57a8540ae'
'40cd342e21f71f5e49e32622b25acc52'
@@ -36,7 +38,9 @@ md5sums=('a96742599fc8a99e52b9e344f39a1000'
'b042647ea7d6f22ad319e12e796bd13e'
'7d0154b7e17ea218c9fa953599d24cc4'
'cea62cc6b903d222c5f26e05a3c0e0e6'
- '46e56492cccb1c9172ed3a235cf43c6c'
+ '73bfaafe25b93f357cf6a3b5eeb70e1b'
+ 'c5de2a946215d647c8af5432ec4b0da0'
+ '55febbb72139ac7b65757df085024b83'
'6e052f1cb693d5d3203f50f9d4e8c33b')
build() {
@@ -67,9 +71,14 @@ build() {
# http://sourceware.org/ml/libc-alpha/2011-06/msg00006.html
patch -Np1 -i ${srcdir}/glibc-2.14-libdl-crash.patch
- # revert fix for http://sourceware.org/bugzilla/show_bug.cgi?id=12684
- # as it causes crashes (FS#24615)
- patch -Np1 -i ${srcdir}/glibc-2.14-revert-4462fad3.patch
+ # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=57912a71 (FS#24615)
+ patch -Np1 -i ${srcdir}/glibc-2.14-fix-resolver-crash-typo.patch
+
+ # re-export RPC interface until libtirpc is ready as a replacement
+ # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=acee4873 (only fedora branch...)
+ patch -Np1 -i ${srcdir}/glibc-2.14-reexport-rpc-interface.patch
+ # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=bdd816a3 (only fedora branch...)
+ patch -Np1 -i ${srcdir}/glibc-2.14-reinstall-nis-rpc-headers.patch
cd ${srcdir}
mkdir glibc-build
diff --git a/multilib-testing/lib32-glibc/glibc-2.14-fix-resolver-crash-typo.patch b/multilib-testing/lib32-glibc/glibc-2.14-fix-resolver-crash-typo.patch
new file mode 100644
index 000000000..b5d86c7d2
--- /dev/null
+++ b/multilib-testing/lib32-glibc/glibc-2.14-fix-resolver-crash-typo.patch
@@ -0,0 +1,22 @@
+diff --git a/resolv/res_send.c b/resolv/res_send.c
+index 97142b7..a001c1e 100644
+--- a/resolv/res_send.c
++++ b/resolv/res_send.c
+@@ -549,7 +549,7 @@ __libc_res_nsend(res_state statp, const u_char *buf, int buflen,
+ ns, ansp, ansp2, nansp2, resplen2);
+ if (n < 0)
+ return (-1);
+- if (n == 0 && (buf2 == NULL || resplen2 == 0))
++ if (n == 0 && (buf2 == NULL || *resplen2 == 0))
+ goto next_ns;
+ } else {
+ /* Use datagrams. */
+@@ -559,7 +559,7 @@ __libc_res_nsend(res_state statp, const u_char *buf, int buflen,
+ ansp2, nansp2, resplen2);
+ if (n < 0)
+ return (-1);
+- if (n == 0 && (buf2 == NULL || resplen2 == 0))
++ if (n == 0 && (buf2 == NULL || *resplen2 == 0))
+ goto next_ns;
+ if (v_circuit)
+ // XXX Check whether both requests failed or
diff --git a/multilib-testing/lib32-glibc/glibc-2.14-reexport-rpc-interface.patch b/multilib-testing/lib32-glibc/glibc-2.14-reexport-rpc-interface.patch
new file mode 100644
index 000000000..e2beea881
--- /dev/null
+++ b/multilib-testing/lib32-glibc/glibc-2.14-reexport-rpc-interface.patch
@@ -0,0 +1,26 @@
+diff --git a/include/libc-symbols.h b/include/libc-symbols.h
+index 67e1ca2..5e7cca5 100644
+--- a/include/libc-symbols.h
++++ b/include/libc-symbols.h
+@@ -635,7 +635,7 @@ for linking")
+ # define libc_hidden_proto(name, attrs...) hidden_proto (name, ##attrs)
+ # define libc_hidden_def(name) hidden_def (name)
+ # define libc_hidden_weak(name) hidden_weak (name)
+-# define libc_hidden_nolink(name, version) hidden_nolink (name, libc, version)
++# define libc_hidden_nolink(name, version) hidden_def (name)
+ # define libc_hidden_ver(local, name) hidden_ver (local, name)
+ # define libc_hidden_data_def(name) hidden_data_def (name)
+ # define libc_hidden_data_weak(name) hidden_data_weak (name)
+diff --git a/sunrpc/Makefile b/sunrpc/Makefile
+index 5134ce9..40c73d1 100644
+--- a/sunrpc/Makefile
++++ b/sunrpc/Makefile
+@@ -53,7 +53,7 @@ headers-in-tirpc = $(addprefix rpc/,auth.h auth_unix.h clnt.h pmap_clnt.h \
+ des_crypt.h)
+ headers-not-in-tirpc = $(addprefix rpc/,key_prot.h rpc_des.h) \
+ $(rpcsvc:%=rpcsvc/%) rpcsvc/bootparam.h
+-headers = rpc/netdb.h
++headers = rpc/netdb.h $(headers-in-tirpc) $(headers-not-in-tirpc)
+ install-others = $(inst_sysconfdir)/rpc
+ generated = $(rpcsvc:%.x=rpcsvc/%.h) $(rpcsvc:%.x=x%.c) $(rpcsvc:%.x=x%.stmp) \
+ $(rpcsvc:%.x=rpcsvc/%.stmp) rpcgen
diff --git a/multilib-testing/lib32-glibc/glibc-2.14-reinstall-nis-rpc-headers.patch b/multilib-testing/lib32-glibc/glibc-2.14-reinstall-nis-rpc-headers.patch
new file mode 100644
index 000000000..eb0fd822d
--- /dev/null
+++ b/multilib-testing/lib32-glibc/glibc-2.14-reinstall-nis-rpc-headers.patch
@@ -0,0 +1,28 @@
+From bdd816a366c4e5bba5de7157d948e0c0737fb4fb Mon Sep 17 00:00:00 2001
+From: Andreas Schwab <schwab@redhat.com>
+Date: Tue, 17 May 2011 17:42:30 +0200
+Subject: [PATCH] Reinstall NIS RPC headers
+
+---
+ nis/Makefile | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/nis/Makefile b/nis/Makefile
+index b5c9609..d2934d9 100644
+--- a/nis/Makefile
++++ b/nis/Makefile
+@@ -23,9 +23,9 @@ subdir := nis
+
+ aux := nis_hash
+
++headers := $(wildcard rpcsvc/*.[hx])
+ distribute := nss-nis.h nss-nisplus.h nis_intern.h Banner \
+- nisplus-parser.h nis_xdr.h nss \
+- $(wildcard rpcsvc/*.[hx])
++ nisplus-parser.h nis_xdr.h nss
+
+ # These are the databases available for the nis (and perhaps later nisplus)
+ # service. This must be a superset of the services in nss.
+--
+1.7.5.4
+
diff --git a/testing/ffmpeg/PKGBUILD b/testing/ffmpeg/PKGBUILD
new file mode 100644
index 000000000..f248b5594
--- /dev/null
+++ b/testing/ffmpeg/PKGBUILD
@@ -0,0 +1,51 @@
+# $Id: PKGBUILD 127807 2011-06-18 16:07:16Z ibiru $
+# Maintainer : Ionut Biru <ibiru@archlinux.org>
+# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
+# Contributor: Paul Mattal <paul@archlinux.org>
+
+pkgname=ffmpeg
+pkgver=20110618
+pkgrel=1
+pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix"
+arch=('i686' 'x86_64')
+url="http://ffmpeg.org/"
+license=('GPL')
+depends=('bzip2' 'lame' 'sdl' 'libvorbis' 'xvidcore' 'zlib' 'x264' 'libtheora' 'opencore-amr' 'alsa-lib' 'libvdpau' 'libxfixes' 'schroedinger' 'libvpx' 'libva' 'openjpeg' 'rtmpdump')
+makedepends=('yasm' 'git')
+#git clone git://git.videolan.org/ffmpeg.git
+source=(ftp://ftp.archlinux.org/other/ffmpeg/${pkgname}-${pkgver}.tar.xz)
+md5sums=('ff3636c6601f68cdcc777fadaf0eba46')
+
+build() {
+ cd "$srcdir/$pkgname"
+
+ ./configure \
+ --prefix=/usr \
+ --enable-libmp3lame \
+ --enable-libvorbis \
+ --enable-libxvid \
+ --enable-libx264 \
+ --enable-libvpx \
+ --enable-libtheora \
+ --enable-postproc \
+ --enable-shared \
+ --enable-x11grab \
+ --enable-libopencore_amrnb \
+ --enable-libopencore_amrwb \
+ --enable-libschroedinger \
+ --enable-libopenjpeg \
+ --enable-librtmp \
+ --enable-gpl \
+ --enable-version3 \
+ --enable-runtime-cpudetect \
+ --disable-debug
+
+ make
+ make tools/qt-faststart
+ make doc/ff{mpeg,play,server}.1
+
+ make DESTDIR="$pkgdir" install install-man
+ install -D -m755 tools/qt-faststart "$pkgdir/usr/bin/qt-faststart"
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/~fauno/distccd-zeroconf/PKGBUILD b/~fauno/distccd-zeroconf/PKGBUILD
new file mode 100644
index 000000000..2faf6acb3
--- /dev/null
+++ b/~fauno/distccd-zeroconf/PKGBUILD
@@ -0,0 +1,50 @@
+# $Id: PKGBUILD 59085 2009-11-20 06:29:43Z giovanni $
+# Maintainer: Judd Vinet <jvinet@zeroflux.org>
+# Contributor: Giovanni Scafora <giovanni@archlinux.org>
+
+pkgname=distcc-zeroconf
+_pkgname=distcc
+pkgver=3.1
+pkgrel=1
+pkgdesc="A distributed C, C++, Obj C compiler with zeroconf support"
+arch=('i686' 'x86_64')
+url="http://code.google.com/p/distcc/"
+license=('GPL')
+depends=('gcc' 'popt' 'avahi')
+makedepends=('gtk2' 'pkgconfig')
+optdepends=('gtk2: for distccmon-gnome')
+provides=('distcc')
+conflicts=('distcc')
+replaces=('distcc')
+backup=(etc/conf.d/distccd)
+options=(!distcc)
+source=(http://distcc.googlecode.com/files/${_pkgname}-${pkgver}.tar.bz2
+ distccd
+ distccd.conf.d)
+md5sums=('a1a9d3853df7133669fffec2a9aab9f3'
+ '1c918474372c09304772c20c4de484fa'
+ '89aaf6e9072092e283465a14e83f0f94')
+
+build() {
+ cd "${srcdir}/${_pkgname}-${pkgver}"
+ ./configure --prefix=/usr \
+ --with-gtk \
+ --sysconfdir=/etc \
+ --mandir=/usr/share/man \
+ --disable-Werror
+ make
+}
+
+package() {
+ cd "${srcdir}/${_pkgname}-${pkgver}"
+ make DESTDIR="${pkgdir}/" install
+ install -D -m644 ${srcdir}/distccd.conf.d ${pkgdir}/etc/conf.d/distccd
+ install -D -m755 ${srcdir}/distccd ${pkgdir}/etc/rc.d/distccd
+
+ install -d ${pkgdir}/usr/lib/${_pkgname}/bin
+ ln -sf /usr/bin/${_pkgname} ${pkgdir}/usr/lib/${_pkgname}/bin/cc
+ ln -sf /usr/bin/${_pkgname} ${pkgdir}/usr/lib/${_pkgname}/bin/gcc
+ ln -sf /usr/bin/${_pkgname} ${pkgdir}/usr/lib/${_pkgname}/bin/g++
+ ln -sf /usr/bin/${_pkgname} ${pkgdir}/usr/lib/${_pkgname}/bin/cpp
+ ln -sf /usr/bin/${_pkgname} ${pkgdir}/usr/lib/${_pkgname}/bin/c++
+}
diff --git a/~fauno/distccd-zeroconf/distccd b/~fauno/distccd-zeroconf/distccd
new file mode 100755
index 000000000..4702d6820
--- /dev/null
+++ b/~fauno/distccd-zeroconf/distccd
@@ -0,0 +1,38 @@
+#!/bin/bash
+
+[ -f /etc/conf.d/distccd ] && . /etc/conf.d/distccd
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+PID=`pidof -o %PPID /usr/bin/distccd`
+case "$1" in
+ start)
+ stat_busy "Starting distcc Daemon"
+ [ -z "$PID" ] && /usr/bin/distccd --daemon ${DISTCC_ARGS}
+ if [ $? -gt 0 ]; then
+ stat_fail
+ else
+ add_daemon distccd
+ stat_done
+ fi
+ ;;
+ stop)
+ stat_busy "Stopping distcc Daemon"
+ [ ! -z "$PID" ] && kill $PID &> /dev/null
+ if [ $? -gt 0 ]; then
+ stat_fail
+ else
+ rm_daemon distccd
+ stat_done
+ fi
+ ;;
+ restart)
+ $0 stop
+ sleep 1
+ $0 start
+ ;;
+ *)
+ echo "usage: $0 {start|stop|restart}"
+esac
+exit 0
diff --git a/~fauno/distccd-zeroconf/distccd.conf.d b/~fauno/distccd-zeroconf/distccd.conf.d
new file mode 100644
index 000000000..8f90cb503
--- /dev/null
+++ b/~fauno/distccd-zeroconf/distccd.conf.d
@@ -0,0 +1,8 @@
+#
+# Parameters to be passed to distccd
+#
+# You must explicitly add IPs (or subnets) that are allowed to connect,
+# using the --allow switch. See the distccd manpage for more info.
+#
+DISTCC_ARGS="--user nobody --allow 127.0.0.1"
+