Wed Jun 22 23:03:32 UTC 2011

18 files changed, 424 insertions, 67 deletions

diff --git a/community/collectd/PKGBUILD b/community/collectd/PKGBUILD
index d801ab20d..193b35857 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')
 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 ec306a80e..7ceabb443 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')
 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 d13e3dab9..94df0f688 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')
 url="http://www.kdenlive.org/"
diff --git a/community/libmemcached/PKGBUILD b/community/libmemcached/PKGBUILD
index ce44a07ee..37192330a 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')
@@ -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 03ba4d40c..a4712826d 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')
 url="http://www.linphone.org/index.php/eng"
diff --git a/community/php-memcached/PKGBUILD b/community/php-memcached/PKGBUILD
index ee4236a0c..7d1c5063d 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')
 url="http://pecl.php.net/package/memcached"
diff --git a/community/prosody/PKGBUILD b/community/prosody/PKGBUILD
index 70fc356c9..6b49b122c 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')
@@ -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 d44f85c08..e2a1f5cf1 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')
 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
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 9bb69ee20..2fe0f3d42 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')
 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 89215fa3f..6e3619898 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')
 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 776460e97..3fd2d6c40 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')
@@ -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 cee1f67cd..b8e3ccf85 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')
@@ -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 3fb02b760..b579056d8 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')
 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
+}