Merge branch 'master' of ssh://kiao.no-ip.info:443/~/pakxe

8 files changed, 15 insertions, 14 deletions

diff --git a/extra/x264/.footprint.i686 b/extra/x264/.footprint.i686
index 6a7e1d373..43811564d 100644
--- a/extra/x264/.footprint.i686
+++ b/extra/x264/.footprint.i686
@@ -3,9 +3,10 @@ drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/x264
 drwxr-xr-x	root/root	usr/include/
 -rw-r--r--	root/root	usr/include/x264.h
+-rw-r--r--	root/root	usr/include/x264_config.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.65
--rw-r--r--	root/root	usr/lib/libx264.so.65
+lrwxrwxrwx	root/root	usr/lib/libx264.so -> libx264.so.114
+-rw-r--r--	root/root	usr/lib/libx264.so.114
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/x264.pc
diff --git a/extra/x264/.footprint.x86_64 b/extra/x264/.footprint.x86_64
index 6a7e1d373..43811564d 100644
--- a/extra/x264/.footprint.x86_64
+++ b/extra/x264/.footprint.x86_64
@@ -3,9 +3,10 @@ drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/x264
 drwxr-xr-x	root/root	usr/include/
 -rw-r--r--	root/root	usr/include/x264.h
+-rw-r--r--	root/root	usr/include/x264_config.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.65
--rw-r--r--	root/root	usr/lib/libx264.so.65
+lrwxrwxrwx	root/root	usr/lib/libx264.so -> libx264.so.114
+-rw-r--r--	root/root	usr/lib/libx264.so.114
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/x264.pc
diff --git a/extra/x264/.md5sum.i686 b/extra/x264/.md5sum.i686
index 96d0e6661..160dded11 100644
--- a/extra/x264/.md5sum.i686
+++ b/extra/x264/.md5sum.i686
@@ -1 +1 @@
-bb5fd9f13b898de0ac8ee2fc5e019c1d  x264-20091224-5f8a149.tar.bz2
+9efd2b5ac9f53cb72b4854ca8cceed44  x264-snapshot-20110304-2245.tar.bz2
diff --git a/extra/x264/.md5sum.x86_64 b/extra/x264/.md5sum.x86_64
index 96d0e6661..160dded11 100644
--- a/extra/x264/.md5sum.x86_64
+++ b/extra/x264/.md5sum.x86_64
@@ -1 +1 @@
-bb5fd9f13b898de0ac8ee2fc5e019c1d  x264-20091224-5f8a149.tar.bz2
+9efd2b5ac9f53cb72b4854ca8cceed44  x264-snapshot-20110304-2245.tar.bz2
diff --git a/extra/x264/Pkgfile b/extra/x264/Pkgfile
index 29a29205b..815db3935 100644
--- a/extra/x264/Pkgfile
+++ b/extra/x264/Pkgfile
@@ -6,12 +6,12 @@
 # Run on: yasm
 
 name=x264
-version=20091224
+version=20110304
 release=1
-source=(http://www.dcaf-security.org/distfiles/x264-$version-5f8a149.tar.bz2)
+source=(http://nutyx.meticul.eu/files/x264-snapshot-$version-2245.tar.bz2)
 
 build() {
-	cd x264
+	cd x264-snapshot-$version-2245
 
 	sed -i \
 		-e 's/-O4/-O3/' \
diff --git a/xorg/xorg-imake/.md5sum.i686 b/xorg/xorg-imake/.md5sum.i686
index f84bad6ed..dd95e45b5 100644
--- a/xorg/xorg-imake/.md5sum.i686
+++ b/xorg/xorg-imake/.md5sum.i686
@@ -1 +1 @@
-ff553c4646edcc9e76b7308991ad421a  imake-1.0.3.tar.bz2
+48133c75bd77c127c7eff122e08ebbf6  imake-1.0.4.tar.bz2
diff --git a/xorg/xorg-imake/.md5sum.x86_64 b/xorg/xorg-imake/.md5sum.x86_64
index f84bad6ed..dd95e45b5 100644
--- a/xorg/xorg-imake/.md5sum.x86_64
+++ b/xorg/xorg-imake/.md5sum.x86_64
@@ -1 +1 @@
-ff553c4646edcc9e76b7308991ad421a  imake-1.0.3.tar.bz2
+48133c75bd77c127c7eff122e08ebbf6  imake-1.0.4.tar.bz2
diff --git a/xorg/xorg-imake/Pkgfile b/xorg/xorg-imake/Pkgfile
index fc79ebef3..3954d060e 100644
--- a/xorg/xorg-imake/Pkgfile
+++ b/xorg/xorg-imake/Pkgfile
@@ -6,15 +6,14 @@
 # Run on: xorg-cf-files
 
 name=xorg-imake
-version=1.0.3
+version=1.0.4
 release=1
 source=(http://xorg.freedesktop.org/releases/individual/util/imake-$version.tar.bz2)
 
 build() {
 	cd imake-$version
 
-	./configure --prefix=/usr \
-		--mandir=/usr/share/man
+	./configure $XORG_CONFIG
 
 	make
 	make DESTDIR=$PKG install