Merge default branch. Updates xvidcore to 1.3.0.

--HG--
branch : gnome3

srcpkgs/xvidcore/template

@@ -1,14 +1,13 @@
 # Template file for 'xvidcore'
 pkgname=xvidcore
-version=1.2.2
-revision=2
+version=1.3.0
 wrksrc="$pkgname"
 distfiles="http://downloads.xvid.org/downloads/$pkgname-$version.tar.bz2"
 build_wrksrc="build/generic"
 build_style=gnu_configure
 short_desc="ISO MPEG-4 compliant video codec"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=e42a602de489438b96f7f4742b68e9bed7efa7aee3570379bb2582b4290b6d11
+checksum=db24f934080cb9811f6e0935e2783243a613afb21a79e635db9e3b1b797e4074
 long_desc="
  XviD is an ISO MPEG-4 compliant video codec library. It's no product,
  it's an open source project which is developed and maintained by lots of

srcpkgs/xvidcore/xvidcore-devel.template

@@ -5,8 +5,6 @@ long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-revision=1
-
 Add_dependency run glibc-devel
 Add_dependency run xvidcore