From 96dc8ec52ed07ef79a3537f9f3cec63a2a2ccf32 Mon Sep 17 00:00:00 2001
From: Danny Rawlins <romster@shortcircuit.net.au>
Date: Tue, 29 Jan 2008 15:13:05 +1100
Subject: x264: r717 -> r736

---
 x264/.footprint | 4 ++--
 x264/.md5sum    | 2 +-
 x264/Pkgfile    | 9 ++++++---
 3 files changed, 9 insertions(+), 6 deletions(-)

(limited to 'x264')

diff --git a/x264/.footprint b/x264/.footprint
index 435cba6a8..2dcb5f4d1 100644
--- a/x264/.footprint
+++ b/x264/.footprint
@@ -5,7 +5,7 @@ drwxr-xr-x	root/root	usr/include/
 -rw-r--r--	root/root	usr/include/x264.h
 drwxr-xr-x	root/root	usr/lib/
 -rw-r--r--	root/root	usr/lib/libx264.a
-lrwxrwxrwx	root/root	usr/lib/libx264.so -> libx264.so.57
--rwxr-xr-x	root/root	usr/lib/libx264.so.57
+lrwxrwxrwx	root/root	usr/lib/libx264.so -> libx264.so.58
+-rwxr-xr-x	root/root	usr/lib/libx264.so.58
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/x264.pc
diff --git a/x264/.md5sum b/x264/.md5sum
index e4425b264..6b6fef61f 100644
--- a/x264/.md5sum
+++ b/x264/.md5sum
@@ -1 +1 @@
-5cd376329ea3f337d0b6bde28e0351f3  x264-snapshot-r717.tar.lzma
+7d684a995f8c06a09d8f2acd414f3daa  x264-snapshot-r736.tar.lzma
diff --git a/x264/Pkgfile b/x264/Pkgfile
index 71eb98441..2adc993b4 100644
--- a/x264/Pkgfile
+++ b/x264/Pkgfile
@@ -5,9 +5,9 @@
 # Depends on: lzma
 
 name=x264
-version=r717
+version=r736
 release=1
-source=(http://romster.shortcircuit.net.au/crux/source/x264-snapshot-$version.tar.lzma)
+source=(http://romster.shortcircuit.net.au/crux/source/x264/x264-snapshot-$version.tar.lzma)
 
 build() {
 	# temp fix untill/if pkgutils supports lzma
@@ -17,8 +17,11 @@ build() {
 	fi
 
 	cd x264
+	export CFLAGS="$(echo $CFLAGS |sed -e 's/-O[s0-3] //')"
 
-	sed -i -e '/^    CFLAGS="/s/-O4 -ffast-math $CFLAGS/${CFLAGS\/-O?\/-O3} -ffast-math/' configure
+	sed -i \
+		-e 's/-O4/-O3/' \
+		-e 's|-I/usr/X11R6/include|-I/usr/X11/include|' configure
 
 	./configure \
 		--prefix=/usr \
-- 
cgit v1.2.3