Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/arm-elf-binutils/PKGBUILD
	community/bird/PKGBUILD
	community/cantata/PKGBUILD
	community/dbmail/PKGBUILD
	community/ekg2/PKGBUILD
	community/ffmpeg-compat/PKGBUILD
	community/gigedit/PKGBUILD
	community/gimp-refocus/PKGBUILD
	community/gmime24/PKGBUILD
	community/gmpc/PKGBUILD
	community/gnash/PKGBUILD
	community/id3lib-rcc/PKGBUILD
	community/linuxsampler/PKGBUILD
	community/lwm/PKGBUILD
	community/midori/PKGBUILD
	community/mplayer2/PKGBUILD
	community/mtpaint/PKGBUILD
	community/nestopia/PKGBUILD
	community/preload/PKGBUILD
	community/projectm/PKGBUILD
	community/rusxmms/PKGBUILD
	community/taglib-rcc/PKGBUILD
	community/the_silver_searcher/PKGBUILD
	community/xnee/PKGBUILD
	core/libgcrypt/PKGBUILD
	core/libusbx/PKGBUILD
	core/mkinitcpio-busybox/PKGBUILD
	extra/a2ps/PKGBUILD
	extra/a52dec/PKGBUILD
	extra/abook/PKGBUILD
	extra/avidemux/PKGBUILD
	extra/bzflag/PKGBUILD
	extra/cln/PKGBUILD
	extra/exempi/PKGBUILD
	extra/ffmpeg/PKGBUILD
	extra/fluxter/PKGBUILD
	extra/fontforge/PKGBUILD
	extra/glib/PKGBUILD
	extra/gnet/PKGBUILD
	extra/gnome-vfs/PKGBUILD
	extra/gnutls/PKGBUILD
	extra/gstreamer0.10-ugly/PKGBUILD
	extra/gtk/PKGBUILD
	extra/idnkit/PKGBUILD
	extra/ilmbase/PKGBUILD
	extra/imake/PKGBUILD
	extra/kdenetwork/PKGBUILD
	extra/libdatrie/PKGBUILD
	extra/libmbim/PKGBUILD
	extra/libmp3splt/PKGBUILD
	extra/libqmi/PKGBUILD
	extra/libtxc_dxtn/PKGBUILD
	extra/libxfont/PKGBUILD
	extra/mesa/PKGBUILD
	extra/modemmanager/PKGBUILD
	extra/nedit/PKGBUILD
	extra/nmap/PKGBUILD
	extra/openexr/PKGBUILD
	extra/purple-plugin-pack/PKGBUILD
	extra/qemu/PKGBUILD
	extra/qtwebkit/PKGBUILD
	extra/subversion/PKGBUILD
	extra/transmission/PKGBUILD
	extra/truecrypt/PKGBUILD
	extra/vigra/PKGBUILD
	extra/virtuoso/PKGBUILD
	extra/vlc/PKGBUILD
	extra/wireshark/PKGBUILD
	extra/wxmaxima/PKGBUILD
	extra/x264/PKGBUILD
	extra/xorg-iceauth/PKGBUILD
	extra/xorg-mkfontscale/PKGBUILD
	extra/xorg-xfd/PKGBUILD
	libre/abuse-libre/PKGBUILD
	libre/clementine-libre/PKGBUILD
	libre/linux-libre/PKGBUILD

1 files changed, 21 insertions, 17 deletions

diff --git a/extra/x264/PKGBUILD b/extra/x264/PKGBUILD
index 0effd2cac..4a06db7df 100644
--- a/extra/x264/PKGBUILD
+++ b/extra/x264/PKGBUILD
@@ -1,37 +1,41 @@
-# $Id: PKGBUILD 178144 2013-02-16 22:49:02Z ioni $
+# $Id: PKGBUILD 191968 2013-08-02 08:00:53Z bpiotrowski $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: damir <damir@archlinux.org>
 # Contributor: Paul Mattal <paul@archlinux.org>
 
 pkgname=x264
-pkgver=20130206
-pkgrel=1
+pkgver=20130702
+pkgrel=2
 pkgdesc="free library for encoding H264/AVC video streams"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.videolan.org/developers/x264.html"
 license=('GPL')
 depends=('glibc')
 makedepends=('yasm' 'git')
-source=(ftp://ftp.archlinux.org/other/packages/$pkgname/$pkgname-$pkgver.tar.xz)
-md5sums=('f952248492745a077ad6a77465276166')
+source=(git://git.videolan.org/x264.git#commit=585324fee3)
+md5sums=('SKIP')
 
-build() {
-    cd $pkgname
-
-    [ "$CARCH" = "mips64el" ] && extra="--enable-pic"
+pkgver() {
+  cd $pkgname
+  git log -1 --format="%cd" --date=short | sed 's|-||g'
+}
 
-    ./configure --enable-shared $extra
+build() {
+  cd $pkgname
 
-    make
+  ./configure --enable-shared \
+    --enable-pic
+  make
 }
+
 package() {
-    cd $pkgname
+  cd $pkgname
 
-    make DESTDIR="$pkgdir" \
-      bindir=/usr/bin \
-      libdir=/usr/lib \
-      includedir=/usr/include \
-      install
+  make DESTDIR="$pkgdir" \
+    bindir=/usr/bin \
+    libdir=/usr/lib \
+    includedir=/usr/include \
+    install
 }
 
 # vim:set ts=2 sw=2 et: