From 288ab04b6393f2d1a6e3c19c48d72ea35a782ee4 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Sun, 24 Mar 2013 16:26:55 +0100
Subject: [PATCH] x264: cross build and dbg support.

---
 srcpkgs/x264/template            | 13 ++++++++++---
 srcpkgs/x264/x264-devel.template |  9 +++------
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/x264/template b/srcpkgs/x264/template
index 8217dfb13f..d2a673e5a7 100644
--- a/srcpkgs/x264/template
+++ b/srcpkgs/x264/template
@@ -3,10 +3,10 @@ pkgname=x264
 _snap_date=20120126
 _snap_rev=2245
 version="${_snap_date}.${_snap_rev}"
-revision=2
+revision=3
 subpackages="x264-devel"
 wrksrc="x264-snapshot-${_snap_date}-${_snap_rev}-stable"
-makedepends="yasm"
+hostmakedepends="yasm"
 short_desc="Free library for encoding H264/AVC video streams"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.videolan.org/developers/x264.html"
@@ -17,7 +17,14 @@ long_desc="
  Stable snapshot version of x264, a high quality H.264 codec."
 
 do_configure() {
-	./configure --disable-swscale --enable-pic --enable-shared
+	if [ "$XBPS_TARGET_MACHINE" != "i686" -o "$XBPS_TARGET_MACHINE" != "x86_64" ]; then
+		_disable_asm="--disable-asm"
+	fi
+	if [ "$XBPS_CROSS_BUILD" ]; then
+		_cross="--host=$XBPS_CROSS_TRIPLET"
+	fi
+	./configure --disable-swscale --enable-static --enable-pic \
+		--enable-shared ${_disable_asm} ${_cross}
 }
 
 do_build() {
diff --git a/srcpkgs/x264/x264-devel.template b/srcpkgs/x264/x264-devel.template
index ec8ea77bf1..d443c2f30e 100644
--- a/srcpkgs/x264/x264-devel.template
+++ b/srcpkgs/x264/x264-devel.template
@@ -1,13 +1,10 @@
 # Template file for 'x264-devel'.
 #
-noarch=yes
-depends="glibc-devel x264>=${version}"
-short_desc="${short_desc} (development files)"
-long_desc="${long_desc}
-
- This package contains files for development, headers, static libs, etc."
+depends="x264>=${version}"
+short_desc="${short_desc} -- development files"
 
 do_install() {
 	vmove usr/include usr
 	vmove usr/lib/pkgconfig usr/lib
+	vmove "usr/lib/*.a" usr/lib
 }