From aa2547ad099dbc0fa7ba88cd333f5d150340090c Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Thu, 11 Aug 2011 23:06:30 +0200
Subject: [PATCH] x264: update to 20110617 stable snapshot.

---
 srcpkgs/x264/depends             |  2 +-
 srcpkgs/x264/template            | 33 +++++++++++++++++++++++---------
 srcpkgs/x264/x264-devel.template |  8 ++------
 3 files changed, 27 insertions(+), 16 deletions(-)

diff --git a/srcpkgs/x264/depends b/srcpkgs/x264/depends
index 2cbb202e26c..531d2125561 100644
--- a/srcpkgs/x264/depends
+++ b/srcpkgs/x264/depends
@@ -1,2 +1,2 @@
-abi_depends=">=20100423"
+abi_depends=">=20110617"
 api_depends="${abi_depends}"
diff --git a/srcpkgs/x264/template b/srcpkgs/x264/template
index e6bdef9d92c..301abfd3c9a 100644
--- a/srcpkgs/x264/template
+++ b/srcpkgs/x264/template
@@ -1,20 +1,35 @@
 # Template file for 'x264'
 pkgname=x264
-_snap_date=20100423
+_snap_date=20110617
 _snap_rev=2245
 version="${_snap_date}.${_snap_rev}"
-revision=1
-wrksrc="x264-snapshot-${_snap_date}-${_snap_rev}"
-distfiles="http://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-${_snap_date}-${_snap_rev}.tar.bz2"
-build_style=configure
-configure_args="--enable-pthread --enable-pic --enable-shared"
-make_install_args="bindir=/usr/bin libdir=/usr/lib includedir=/usr/include"
+wrksrc="x264-snapshot-${_snap_date}-${_snap_rev}-stable"
+distfiles="http://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-${_snap_date}-${_snap_rev}-stable.tar.bz2"
+build_style=custom-install
 short_desc="Free library for encoding H264/AVC video streams"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=eb3a5b0e0705bcbd9ce9808fb509eaac3e4fbc0a593b5bd359c4d1cb896b5e1f
+homepage="http://www.videolan.org/developers/x264.html"
+license="GPL-2"
+checksum=ce6793f9b197c55246c37ca971c652c8af5621b2e759c2f9c0b1e967b16c606a
 long_desc="
- Development version of x264, a high quality H.264 codec."
+ Stable snapshot version of x264, a high quality H.264 codec."
 
 subpackages="$pkgname-devel"
 Add_dependency run glibc
 Add_dependency build yasm
+
+do_configure()
+{
+	./configure --enable-pic --enable-shared
+}
+
+do_build()
+{
+	make ${makejobs}
+}
+
+do_install()
+{
+	make DESTDIR=${DESTDIR} \
+		bindir=/usr/bin libdir=/usr/lib includedir=/usr/include install
+}
diff --git a/srcpkgs/x264/x264-devel.template b/srcpkgs/x264/x264-devel.template
index 6339e3af615..c70afa4fbc8 100644
--- a/srcpkgs/x264/x264-devel.template
+++ b/srcpkgs/x264/x264-devel.template
@@ -5,15 +5,11 @@ long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-revision=1
-
 Add_dependency run glibc-devel
 Add_dependency run x264
 
 do_install()
 {
-	mkdir -p ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
-	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/*.*a ${DESTDIR}/usr/lib
+	vmove usr/include usr
+	vmove usr/lib/pkgconfig usr/lib
 }