Merge remote-tracking branch 'upstream/master'

2013-06-23 10:18:59 -03:00 · 2013-06-23 10:18:59 -03:00 · c5ec329c28
commit c5ec329c28
parent 2f33123702 00d83d5915
30 changed files with 254 additions and 77 deletions
--- a/common/shlibs
+++ b/common/shlibs
@ -1351,3 +1351,4 @@ libkgapi.so.1 libkgapi-2.0.1_1
 libkgapi2.so.2 libkgapi-2.0.1_1
 libqoauth.so.1 qoauth-1.0.1_1
 libIrrlicht.so.1.8 irrlicht-1.8_1
+libsnappy.so.1 snappy-1.1.0_1
--- a/srcpkgs/automake/template
+++ b/srcpkgs/automake/template
@ -1,6 +1,6 @@
 # Template build file for 'automake'.
 pkgname=automake
-version=1.13.2
+version=1.14
 revision=1
 build_style=gnu-configure
 hostmakedepends="perl autoconf>=2.60"
@ -9,7 +9,7 @@ maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
 homepage="http://www.gnu.org/software/automake"
 distfiles="http://ftp.gnu.org/gnu/automake/${pkgname}-${version}.tar.xz"
-checksum=80692147333399def4116ac1967e92fea9dd26f28670a36600efc2755648a646
+checksum=e1188f5d074374cf06946cabb2b9e70bee141637a8fd1fab9a660c8930fe8059

 automake_package() {
 	depends="perl autoconf>=2.60"
--- a/srcpkgs/bluez/template
+++ b/srcpkgs/bluez/template
@ -1,21 +1,20 @@
 # Template file for 'bluez'
 pkgname=bluez
-version=5.5
+version=5.6
 revision=1
 build_style=gnu-configure
 configure_args="--with-udevdir=/usr/lib/udev
 --with-systemdsystemunitdir=/usr/lib/systemd/system
 --enable-pie --enable-threads --enable-library"
 hostmakedepends="pkg-config flex"
-makedepends="libglib-devel libudev-devel>=183 dbus-devel
- libusb-compat-devel cups-devel libical-devel readline-devel
- systemd-devel"
+makedepends="libglib-devel libudev-devel>=183 dbus-devel systemd-devel
+ libusb-compat-devel>=0.1.5_2 cups-devel libical-devel readline-devel"
 short_desc="Bluetooth tools and daemons"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.bluez.org/"
 license="GPL-2"
 distfiles="${KERNEL_SITE}/bluetooth/$pkgname-$version.tar.xz"
-checksum=bd4660639b0d423adafe52d62143a7a816c8f5a94f6efef8aeaa7f0a3f014dc6
+checksum=feef22586e1aac28f61ba22ae836fab7a758501395a532e1a009c50e03de1789
 long_desc="
 This package contains tools and system daemons for using Bluetooth devices.

@ -25,7 +24,7 @@ long_desc="
 libbluetooth_package() {
 	short_desc="Library to use the Bluez Linux Bluetooth Stack"
 	pkg_install() {
-		vmove "usr/lib/libbluetooth.so*"
+		vmove "usr/lib/libbluetooth.so.*"
 	}
 }

@ -35,6 +34,7 @@ libbluetooth-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
 	}
 }

--- a/srcpkgs/ca-certificates/template
+++ b/srcpkgs/ca-certificates/template
@ -1,6 +1,6 @@
 # Template file for 'ca-certificates'
 pkgname=ca-certificates
-version=20130119
+version=20130610
 revision=1
 makedepends="python openssl run-parts"
 short_desc="Common CA certificates"
@ -8,7 +8,7 @@ maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://packages.qa.debian.org/c/ca-certificates.html"
 license="GPL-2"
 distfiles="${DEBIAN_SITE}/main/c/${pkgname}/${pkgname}_${version}.tar.gz"
-checksum=fb51ec9a2c551838cc1646a0b3c9e6bea5c1bb20ff5d71c542451fac4b191c22
+checksum=9529a9cdfca53dc2ecea96171d8d2ff6ff343843f894af4d446686f02a6c03f2
 long_desc="
 This package includes PEM files of CA certificates to allow SSL-based
 applications to check for the authenticity of SSL connections."
--- a/srcpkgs/cmus-faad
+++ b/srcpkgs/cmus-faad
@ -0,0 +1 @@
+cmus
--- a/srcpkgs/cmus-ffmpeg
+++ b/srcpkgs/cmus-ffmpeg
@ -0,0 +1 @@
+cmus
--- a/srcpkgs/cmus-flac
+++ b/srcpkgs/cmus-flac
@ -0,0 +1 @@
+cmus
--- a/srcpkgs/cmus-libao
+++ b/srcpkgs/cmus-libao
@ -0,0 +1 @@
+cmus
--- a/srcpkgs/cmus-modplug
+++ b/srcpkgs/cmus-modplug
@ -0,0 +1 @@
+cmus
--- a/srcpkgs/cmus-mpc
+++ b/srcpkgs/cmus-mpc
@ -0,0 +1 @@
+cmus
--- a/srcpkgs/cmus-opus
+++ b/srcpkgs/cmus-opus
@ -0,0 +1 @@
+cmus
--- a/srcpkgs/cmus-oss
+++ b/srcpkgs/cmus-oss
@ -0,0 +1 @@
+cmus
--- a/srcpkgs/cmus-pulseaudio
+++ b/srcpkgs/cmus-pulseaudio
@ -0,0 +1 @@
+cmus
--- a/srcpkgs/cmus-wavpack
+++ b/srcpkgs/cmus-wavpack
@ -0,0 +1 @@
+cmus
--- a/srcpkgs/cmus/template
+++ b/srcpkgs/cmus/template
@ -1,10 +1,8 @@
 # Template file for 'cmus'
 pkgname=cmus
 version=2.5.0
-revision=2
+revision=3
 wrksrc="cmus-v${version}"
-build_style=configure
-configure_args="prefix=/usr"
 short_desc="Small, fast and powerful console music player"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
@ -12,13 +10,97 @@ homepage="http://cmus.sourceforge.net"
 distfiles="${SOURCEFORGE_SITE}/cmus/cmus-v${version}.tar.bz2"
 checksum=2021fab64088898d62d1439525ec345e219f58d91a9e933dc85e84eda21c8ddf

-makedepends="pkg-config faad2-devel libflac-devel libao-devel libmad-devel
+hostmakedepends="pkg-config"
+makedepends="faad2-devel libflac-devel libao-devel libmad-devel
 libmodplug-devel libmp4v2-devel>=2.0.0 libmpcdec-devel pulseaudio-devel
 opusfile-devel wavpack-devel alsa-lib-devel libvorbis-devel ffmpeg-devel
 ncurses-devel"

-cmus_package() {
+do_configure() {
+	./configure prefix=/usr
+}
+
+do_build() {
+	make GCC=$CC CC=$CC LD=$CC ${makejobs}
+}
+
+do_install() {
+	make DESTDIR=$DESTDIR install
+}
+
+cmus-libao_package() {
+	short_desc+=" - libao output plugin"
 	pkg_install() {
-		vmove usr
+		vmove usr/lib/cmus/op/ao.so
+	}
+}
+
+cmus-faad_package() {
+	short_desc+=" - AAC/MP4 input plugin"
+	pkg_install() {
+		vmove usr/lib/cmus/ip/aac.so
+		vmove usr/lib/cmus/ip/mp4.so
+	}
+}
+
+cmus-ffmpeg_package() {
+	short_desc+=" - FFmpeg input plugin"
+	pkg_install() {
+		vmove usr/lib/cmus/ip/ffmpeg.so
+	}
+}
+
+cmus-flac_package() {
+	short_desc+=" - FLAC input plugin"
+	pkg_install() {
+		vmove usr/lib/cmus/ip/flac.so
+	}
+}
+
+cmus-mpc_package() {
+	short_desc+=" - MPC input plugin"
+	pkg_install() {
+		vmove usr/lib/cmus/ip/mpc.so
+	}
+}
+
+cmus-modplug_package() {
+	short_desc+=" - MOD input plugin"
+	pkg_install() {
+		vmove usr/lib/cmus/ip/modplug.so
+	}
+}
+
+cmus-opus_package() {
+	short_desc+=" - Opus input plugin"
+	pkg_install() {
+		vmove usr/lib/cmus/ip/opus.so
+	}
+}
+
+cmus-oss_package() {
+	short_desc+=" - OSS output plugin"
+	pkg_install() {
+		vmove usr/lib/cmus/op/oss.so
+	}
+}
+
+cmus-pulseaudio_package() {
+	short_desc+=" - Pulseaudio output plugin"
+	pkg_install() {
+		vmove usr/lib/cmus/op/pulse.so
+	}
+}
+
+cmus-wavpack_package() {
+	short_desc+=" - Wavpack input plugin"
+	pkg_install() {
+		vmove usr/lib/cmus/ip/wavpack.so
+	}
+}
+
+cmus_package() {
+	pkg_install() {
+		vmove all
 	}
 }
--- a/srcpkgs/curl/template
+++ b/srcpkgs/curl/template
@ -1,6 +1,6 @@
 # Template build file for 'curl'.
 pkgname=curl
-version=7.30.0
+version=7.31.0
 revision=1
 build_style=gnu-configure
 configure_args="--disable-ldaps --with-gssapi=/usr
@ -13,13 +13,13 @@ maintainer="Juan RP <xtraeme@gmail.com>"
 license="MIT"
 homepage="http://curl.haxx.se"
 distfiles="$homepage/download/$pkgname-$version.tar.bz2"
-checksum=6b1c410387bea82601baec85d6aa61955794672e36766407e99ade8d55aaaf11
+checksum=a73b118eececff5de25111f35d1d0aafe1e71afdbb83082a8e44d847267e3e08

 libcurl_package() {
 	replaces="curl-libs<7.20.1"
 	short_desc="The multiprotocol file transfer library"
 	pkg_install() {
-		vmove "usr/lib/*.so*"
+		vmove "usr/lib/*.so.*"
 	}
 }

@ -32,6 +32,7 @@ libcurl-devel_package() {
 		vmove "usr/share/man/man1/curl-config*"
 		vmove usr/include
 		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
 		vmove usr/lib/pkgconfig
 		vmove usr/share/man/man3
 	}
--- a/srcpkgs/dhcpcd/template
+++ b/srcpkgs/dhcpcd/template
@ -1,17 +1,17 @@
 # Template file for 'dhcpcd'
 pkgname=dhcpcd
-version=5.6.8
-revision=2
+version=6.0.0
+revision=1
 build_style=configure
 configure_args="--prefix=/usr --libexecdir=/usr/lib
 --sysconfdir=/etc --rundir=/run"
-makedepends="which ntp"
+hostmakedepends="which ntp"
 short_desc="RFC2131 compliant DHCP client"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="Simplified BSD"
 homepage="http://roy.marples.name/projects/dhcpcd"
 distfiles="http://roy.marples.name/downloads/dhcpcd/dhcpcd-$version.tar.bz2"
-checksum=a3b15da770623774f4e659bf3239fca50f03594207bca3a2ad011f0b68d8eec4
+checksum=174c78016ae7e27e723e4b61f1f6683021c3fe940d575ba7b4722a291b246e9f

 post_install() {
 	chmod 755 ${DESTDIR}/usr/sbin/dhcpcd
--- a/srcpkgs/dwm/template
+++ b/srcpkgs/dwm/template
@ -1,7 +1,7 @@
 # Template file for 'dwm'
 pkgname=dwm
 version=6.0
-revision=1
+revision=2
 homepage="http://dwm.suckless.org"
 distfiles="http://dl.suckless.org/dwm/dwm-$version.tar.gz"
 makedepends="libX11-devel libXinerama-devel"
@ -21,7 +21,7 @@ do_build() {
 	sed -i 's/^#CFLAGS = -std/CFLAGS += -std/g' config.mk
 	sed -i 's/^LDFLAGS = -g/#LDFLAGS += -g/g' config.mk
 	sed -i 's/^#LDFLAGS = -s/LDFLAGS += -s/g' config.mk
-	make CC=$CC INCS="-I." LIBS="-lX11"
+	make CC=$CC INCS="-I." LIBS="-lX11 -lXinerama"
 }

 do_install() {
--- a/srcpkgs/e2fsprogs/template
+++ b/srcpkgs/e2fsprogs/template
@ -1,13 +1,13 @@
 # Template file for 'e2fsprogs'
 pkgname=e2fsprogs
-version=1.42.7
-revision=2
+version=1.42.8
+revision=1
 short_desc="Ext2/3/4 Filesystem Utilities"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2, LGPL-2.1"
 homepage="http://e2fsprogs.sourceforge.net/"
 distfiles="$SOURCEFORGE_SITE/e2fsprogs/$pkgname-$version.tar.gz"
-checksum=dc6501b2e75d205e425196d753d92b129c568525d8aad08085c0aa69ee9e7345
+checksum=b984aaf1fe888d6a4cf8c2e8d397207879599b5368f1d33232c1ec9d68d00c97

 build_style=gnu-configure
 configure_args="--enable-htree --enable-elf-shlibs --disable-fsck
@ -29,17 +29,16 @@ post_install() {
 	rm -f ${DESTDIR}/usr/lib/libuuid*
 	rm -rf ${DESTDIR}/usr/include/uuid
 	rm -f ${DESTDIR}/usr/lib/pkgconfig/uuid*
-
-	# Remove static libs.
-	rm -f ${DESTDIR}/usr/lib/*.a
 }

 e2fsprogs-devel_package() {
-	depends="libuuid-devel libblkid-devel e2fsprogs-libs>=${version}"
-	short_desc="${short_desc} -- development files"
+	depends="libuuid-devel libblkid-devel e2fsprogs-libs-${version}_${revision}"
+	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
 		vmove usr/bin/compile_et
 		vmove usr/bin/mk_cmds
 		vmove usr/share/man/man1/compile_et.1
@ -52,16 +51,15 @@ e2fsprogs-devel_package() {
 }

 e2fsprogs-libs_package() {
-	short_desc="${short_desc} -- shared libraries"
+	short_desc+=" - shared libraries"
 	pkg_install() {
-		vmove "usr/lib/*.so*"
+		vmove "usr/lib/*.so.*"
 	}
 }

 e2fsprogs_package() {
 	conf_files="/etc/mke2fs.conf"
 	pkg_install() {
-		vmove etc
-		vmove usr
+		vmove all
 	}
 }
--- a/srcpkgs/enca/patches/configure_cross.patch
+++ b/srcpkgs/enca/patches/configure_cross.patch
@ -0,0 +1,19 @@
+--- configure.orig	2013-05-26 17:02:23.033985581 +0200
+++ configure	2013-05-26 17:03:03.482704657 +0200
+@@ -12896,16 +12896,6 @@ _ACEOF
+ 
+ fi
+ 
+-
+-if test "$prefix" = "NONE"; then
+-  LDFLAGS="$LDFLAGS -L$ac_default_prefix/lib"
+-  CPPFLAGS="$CPPFLAGS -I$ac_default_prefix/include"
+-else
+-  LDFLAGS="$LDFLAGS -L$prefix/lib"
+-  CPPFLAGS="$CPPFLAGS -I$prefix/include"
+-fi
+-
+-
+ case "$target" in
+ NONE) yeti_libm_target="$host" ;;
+ *) yeti_libm_target="$target" ;;
--- a/srcpkgs/enca/template
+++ b/srcpkgs/enca/template
@ -1,10 +1,13 @@
 # Template file for 'enca'
 pkgname=enca
 version=1.14
-revision=2
+revision=3
 build_style=gnu-configure
-configure_args="--enable-external --disable-static"
-makedepends="pkg-config recode-devel"
+configure_args="--enable-external --disable-static ac_cv_file__dev_random=yes
+ ac_cv_file__dev_urandom=yes ac_cv_file__dev_srandom=no
+ ac_cv_file__dev_arandom=no am_cv_func_iconv_works=yes libiconv_ok=yes"
+hostmakedepends="pkg-config"
+makedepends="recode-devel>=3.6_6"
 short_desc="Extremely Naive Charset Analyser and converter"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://cihar.com/software/enca/"
@ -12,19 +15,26 @@ license="GPL-2"
 distfiles="http://dl.cihar.com/enca/enca-${version}.tar.bz2"
 checksum=7f33e3953fbbdac8ed144b31bbab1bb3bf181150db6ba4cd812fd958ce5f4b58

+pre_build() {
+	# make_hash must be built for the host.
+	cd tools
+	make CC=cc CFLAGS=-Os
+}
+
 libenca_package() {
-	short_desc="${short_desc} - shared library"
+	short_desc+=" - shared library"
 	pkg_install() {
-		vmove "usr/lib/*.so*"
+		vmove "usr/lib/*.so.*"
 	}
 }

 enca-devel_package() {
 	depends="recode-devel libenca>=${version}"
-	short_desc="${short_desc} - development files"
+	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
 		vmove usr/share/gtk-doc
 	}
 }
--- a/srcpkgs/ffmpeg/template
+++ b/srcpkgs/ffmpeg/template
@ -1,7 +1,7 @@
 # Template file for 'ffmpeg'
 pkgname=ffmpeg
 version=1.0.5
-revision=4
+revision=5
 short_desc="Decoding, encoding and streaming software"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-3"
@ -9,24 +9,47 @@ homepage="http://www.ffmpeg.org"
 distfiles="${homepage}/releases/ffmpeg-${version}.tar.bz2"
 checksum=1f1af23112e2da8403abce605749db9111d45d2e4e28910831e778c6e2cbdcce

-makedepends="pkg-config perl yasm zlib-devel alsa-lib-devel libXfixes-devel
+hostmakedepends="pkg-config perl yasm"
+makedepends="zlib-devel bzip2-devel freetype-devel alsa-lib-devel libXfixes-devel
 libXext-devel libXvMC-devel faad2-devel lame-devel libtheora-devel
 libvorbis-devel x264-devel xvidcore-devel jack-devel SDL-devel libcdio-devel
- libvpx-devel libva-devel libvdpau-devel librtmp-devel freetype-devel
- libmodplug-devel speex-devel celt-devel harfbuzz-devel libass-devel opus-devel"
+ libvpx-devel librtmp-devel freetype-devel libmodplug-devel speex-devel
+ celt-devel harfbuzz-devel libass-devel opus-devel pulseaudio-devel"
+
+if [ "$XBPS_TARGET_MACHINE" = "i686" -o "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
+	makedepends+=" libva-devel libvdpau-devel "
+fi

 do_configure() {
+	if [ "$XBPS_TARGET_MACHINE" = "i686" -o "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
+		_args="--enable-vdpau --enable-vaapi"
+	fi
+        if [ "$CROSS_BUILD" ]; then
+                case "$XBPS_TARGET_MACHINE" in
+                        arm*) _arch="arm";;
+                        mips*) _arch="mips";;
+                        i686|x86_64) _arch="$XBPS_TARGET_MACHINE";;
+                esac
+
+                _args+=" --enable-cross-compile
+                        --sysroot=$XBPS_CROSS_BASE
+                        --cross-prefix=${XBPS_CROSS_TRIPLET}-
+                        --target-os=linux --arch=${_arch}"
+
+		# Remove this pkg_config kludge, breaks cross build.
+		sed -e 's,$pkg_config --,pkg-config --,g' -i configure
+	fi
+
 	./configure --prefix=/usr --disable-debug --enable-gpl \
 		--enable-libcdio --enable-version3 --enable-runtime-cpudetect \
 		--enable-libmp3lame --enable-libvorbis --enable-libxvid \
 		--enable-libx264 --enable-libvpx --enable-libtheora \
-		--enable-vdpau --enable-vaapi --enable-postproc \
 		--enable-shared --enable-x11grab --enable-librtmp \
 		--enable-libpulse --enable-libfreetype --enable-libmodplug \
 		--enable-libspeex --enable-libcelt --enable-libass \
 		--disable-libopencore_amrnb --disable-libopencore_amrwb \
 		--disable-libschroedinger --disable-libopenjpeg \
-		--disable-static
+		--disable-static --enable-postproc ${_args}
 }

 do_build() {
@ -41,56 +64,56 @@ do_install() {
 libavcodec_package() {
 	short_desc="FFmpeg codec library"
 	pkg_install() {
-		vmove "usr/lib/libavcodec.so*"
+		vmove "usr/lib/libavcodec.so.*"
 	}
 }

 libavdevice_package() {
 	short_desc="FFmpeg device handling library"
 	pkg_install() {
-		vmove "usr/lib/libavdevice.so*"
+		vmove "usr/lib/libavdevice.so.*"
 	}
 }

 libavformat_package() {
 	short_desc="FFmpeg file format library"
 	pkg_install() {
-		vmove "usr/lib/libavformat.so*"
+		vmove "usr/lib/libavformat.so.*"
 	}
 }

 libavutil_package() {
 	short_desc="FFmpeg utility library"
 	pkg_install() {
-		vmove "usr/lib/libavutil.so*"
+		vmove "usr/lib/libavutil.so.*"
 	}
 }

 libavfilter_package() {
 	short_desc="FFmpeg audio/video filter library"
 	pkg_install() {
-		vmove "usr/lib/libavfilter.so*"
+		vmove "usr/lib/libavfilter.so.*"
 	}
 }

 libpostproc_package() {
 	short_desc="FFmpeg video postprocessing library"
 	pkg_install() {
-		vmove "usr/lib/libpostproc.so*"
+		vmove "usr/lib/libpostproc.so.*"
 	}
 }

 libswscale_package() {
 	short_desc="FFmpeg video scaling library"
 	pkg_install() {
-		vmove "usr/lib/libswscale.so*"
+		vmove "usr/lib/libswscale.so.*"
 	}
 }

 libswresample_package() {
 	short_desc="FFmpeg video resampling library"
 	pkg_install() {
-		vmove "usr/lib/libswresample.so*"
+		vmove "usr/lib/libswresample.so.*"
 	}
 }

@ -98,18 +121,17 @@ ffmpeg-devel_package() {
 	depends="libavcodec>=${version} libavdevice>=${version} libavformat>=${version}
 		libavutil>=${version} libavfilter>=${version} libpostproc>=${version}
 		libswscale>=${version} libswresample>=${version}"
-	short_desc="${short_desc} - development files"
+	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
 		vmove usr/share/ffmpeg/examples
 	}
 }

 ffmpeg_package() {
 	pkg_install() {
-		vmove usr/bin
-		vmove usr/share/man
-		vmove usr/share/ffmpeg
+		vmove all
 	}
 }
--- a/srcpkgs/gdk-pixbuf/template
+++ b/srcpkgs/gdk-pixbuf/template
@ -1,7 +1,7 @@
 # Template build file for 'gdk-pixbuf'.
 pkgname=gdk-pixbuf
-version=2.28.1
-revision=3
+version=2.28.2
+revision=1
 build_style=gnu-configure
 configure_args="--without-libjasper --with-included-loaders=png --with-x11"
 hostmakedepends="perl pkg-config"
@ -12,7 +12,7 @@ maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gtk.org/"
 license="GPL-2"
 distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
-checksum=bea0b743fdb5c3c8e23210f73623ec5f18f9ead2522942897fe739d80b50c2bb
+checksum=183113c2eb2232963e88864a6a54fd963dbfeb1a3679fb0d3456f9e0b79e4617

 if [ "$CROSS_BUILD" ]; then
 	# needs glib-mkenums
--- a/srcpkgs/libXv/template
+++ b/srcpkgs/libXv/template
@ -1,6 +1,6 @@
 # Template build file for 'libXv'.
 pkgname=libXv
-version=1.0.8
+version=1.0.9
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@ -10,7 +10,7 @@ maintainer="Juan RP <xtraeme@gmail.com>"
 license="MIT"
 homepage="${XORG_SITE}"
 distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2"
-checksum=4f00eb5347390909cea4e53a69425839d2a6a44e0e0613321d59e7e4aeaf73d7
+checksum=a874dbf864d0271bbe795af67ef5b3f20096c92fc11eacbf0d2af00e32bc5b4b

 libXv-devel_package() {
 	depends="xproto videoproto libX11-devel libXext-devel libXv>=${version}"
@ -18,6 +18,7 @@ libXv-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
 		vmove usr/lib/pkgconfig
 		vmove usr/share
 	}
--- a/srcpkgs/libusb-compat/template
+++ b/srcpkgs/libusb-compat/template
@ -1,7 +1,7 @@
 # Template file for 'libusb-compat'
 pkgname=libusb-compat
 version=0.1.5
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libusbx-devel"
@ -17,12 +17,13 @@ long_desc="
 just converts libusb-0.1 calls into their libusb-1.0 equivalents."

 libusb-compat-devel_package() {
-	depends="libusb-compat>=${version}"
+	depends="libusbx-devel libusb-compat>=${version}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/bin
 		vmove usr/include
 		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
 		vmove usr/lib/pkgconfig
 	}
 }
--- a/srcpkgs/pulseaudio/template
+++ b/srcpkgs/pulseaudio/template
@ -1,14 +1,14 @@
 # Template file for 'pulseaudio'
 pkgname=pulseaudio
 version=4.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-oss-output --disable-oss-wrapper --disable-tcpwrap
 --enable-jack --disable-lirc --disable-hal-compat --disable-gconf --enable-orc
 --with-database=tdb --with-udev-rules-dir=/usr/lib/udev/rules.d
- --disable-esound"
+ --disable-esound --disable-gtk3"
 hostmakedepends="pkg-config intltool which"
-makedepends="zlib-devel gtk+3-devel libltdl-devel speex-devel libXi-devel
+makedepends="zlib-devel libltdl-devel glib-devel libudev-devel speex-devel libXi-devel
 libXtst-devel xcb-util-devel libsndfile-devel libasyncns-devel
 dbus-devel tdb-devel libcap-devel avahi-libs-devel openssl-devel
 libsamplerate-devel json-c-devel>=0.11_2 orc-devel jack-devel fftw-devel
@ -40,9 +40,9 @@ post_install() {
 libpulseaudio_package() {
 	short_desc+=" - shared libraries"
 	pkg_install() {
-		vmove "usr/lib/libpulse.so*"
-		vmove "usr/lib/libpulse-simple.so*"
-		vmove "usr/lib/libpulse-mainloop-glib.so*"
+		vmove "usr/lib/libpulse.so.*"
+		vmove "usr/lib/libpulse-simple.so.*"
+		vmove "usr/lib/libpulse-mainloop-glib.so.*"
 		vmove usr/lib/pulseaudio
 	}
 }
@ -55,6 +55,9 @@ pulseaudio-devel_package() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
 		vmove usr/lib/cmake
+		vmove usr/lib/libpulse.so
+		vmove usr/lib/libpulse-simple.so
+		vmove usr/lib/libpulse-mainloop-glib.so
 		vmove usr/share/vala
 	}
 }
--- a/srcpkgs/snappy-devel
+++ b/srcpkgs/snappy-devel
@ -0,0 +1 @@
+snappy
--- a/srcpkgs/snappy/template
+++ b/srcpkgs/snappy/template
@ -0,0 +1,28 @@
+# Template file for 'snappy'
+pkgname=snappy
+version=1.1.0
+revision=1
+build_style=gnu-configure
+makedepends="zlib-devel lzo-devel"
+short_desc="A fast compressor/decompressor library"
+maintainer="Juan RP <xtraeme@gmail.com>"
+homepage="http://code.google.com/p/snappy/"
+license="BSD"
+distfiles="http://snappy.googlecode.com/files/snappy-${version}.tar.gz"
+checksum=1fa82bc588bb93fa74dfc0e2e9b7d63b6e2a20ede323ef42bf0af0f947676160
+
+snappy-devel_package() {
+	depends="${sourcepkg}-${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+	}
+}
+
+snappy_package() {
+	pkg_install() {
+		vmove usr
+	}
+}
--- a/srcpkgs/xbps-src/template
+++ b/srcpkgs/xbps-src/template
@ -1,6 +1,6 @@
 # Template file for 'xbps-src'
 pkgname=xbps-src
-version=20130621
+version=20130622
 revision=1
 build_style=gnu-makefile
 make_build_args="PREFIX=/usr ETCDIR=/etc/xbps"
--- a/srcpkgs/xf86-video-intel/template
+++ b/srcpkgs/xf86-video-intel/template
@ -1,6 +1,6 @@
 # Template build file for 'xf86-video-intel'.
 pkgname=xf86-video-intel
-version=2.21.9
+version=2.21.10
 revision=1
 build_style=gnu-configure
 configure_args="--with-default-accel=sna --enable-kms-only --enable-sna"
@ -12,7 +12,7 @@ maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://xorg.freedesktop.org/"
 license="MIT"
 distfiles="${XORG_SITE}/driver/$pkgname-$version.tar.bz2"
-checksum=1359cbc9e494a284faa52d1db83e7388cb8ab590b660e29e78e6e7f5ee7ff189
+checksum=7a4bcad83e8153ab1eec46dfee2412b7b20d087f438af4bf97f460f67c5ca9b6

 only_for_archs="i686 x86_64"