diff options
| author | Jan Schmidt <thaytan@noraisin.net> | 2014-02-13 14:26:14 +1100 |
|---|---|---|
| committer | Jan Schmidt <thaytan@noraisin.net> | 2014-02-14 00:54:25 +1100 |
| commit | 2b906b63bbd197275f2ac90cedec32e7e313e302 (patch) | |
| tree | 7fd643b288f50ce4ed61be54de5f75593e517fb8 | |
| parent | 7218b16f64c53714fef8feec28f731f0f185b577 (diff) | |
x264: Update to 20140212-2245-stable
Fixes a crash when compiled with gcc 4.8
| -rw-r--r-- | recipes/x264.recipe | 7 | ||||
| -rw-r--r-- | recipes/x264/0001-binutils-fix.patch | 72 |
2 files changed, 3 insertions, 76 deletions
diff --git a/recipes/x264.recipe b/recipes/x264.recipe index 041ee033..967515d9 100644 --- a/recipes/x264.recipe +++ b/recipes/x264.recipe @@ -3,17 +3,16 @@ from cerbero.tools.libtool import LibtoolLibrary class Recipe(recipe.Recipe): - version = '20120827-2245' + version = '20140212-2245' name = 'x264' licenses = [License.GPL] stype = SourceType.TARBALL configure_tpl = "%(config-sh)s --prefix=%(prefix)s "\ "--libdir=%(libdir)s %(options)s" configure_options = '--enable-shared --enable-static --enable-pic --disable-strip' - url = 'http://ftp.videolan.org/pub/x264/snapshots/x264-snapshot-20120827-2245-stable.tar.bz2' - tarball_dirname= 'x264-snapshot-20120827-2245-stable' + url = 'http://download.videolan.org/pub/x264/snapshots/x264-snapshot-20140212-2245-stable.tar.bz2' + tarball_dirname= 'x264-snapshot-20140212-2245-stable' new_env = {'AS': 'yasm'} - patches = [ 'x264/0001-binutils-fix.patch' ] files_libs = ['libx264'] files_bins = ['x264'] diff --git a/recipes/x264/0001-binutils-fix.patch b/recipes/x264/0001-binutils-fix.patch deleted file mode 100644 index ccd84d2d..00000000 --- a/recipes/x264/0001-binutils-fix.patch +++ /dev/null @@ -1,72 +0,0 @@ -From 593e8cc0b374aa7b20d3d961c57feb9bab508979 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Bernhard=20Rosenkr=C3=A4nzer?= - <bernhard.rosenkranzer@linaro.org> -Date: Sun, 30 Dec 2012 12:18:00 -0800 -Subject: [PATCH] Fix build on ARM with binutils >= 2.23.51.0.6 GAS doesn't - seem to like spaces in vld1 anymore, so remove those. - ---- - common/arm/pixel-a.S | 16 ++++++++-------- - 1 file changed, 8 insertions(+), 8 deletions(-) - -diff --git a/common/arm/pixel-a.S b/common/arm/pixel-a.S -index 8bce3b6..fa0004f 100644 ---- a/common/arm/pixel-a.S -+++ b/common/arm/pixel-a.S -@@ -68,45 +68,45 @@ SAD4_ARMV6 8 - - - .macro SAD_START_4 align:vararg -- vld1.32 {d1[]}, [r2 \align], r3 -+ vld1.32 {d1[]}, [r2\align], r3 - vld1.32 {d0[]}, [r0,:32], r1 - vabdl.u8 q8, d0, d1 - .endm - - .macro SAD_4 align:vararg -- vld1.32 {d1[]}, [r2 \align], r3 -+ vld1.32 {d1[]}, [r2\align], r3 - vld1.32 {d0[]}, [r0,:32], r1 - vabal.u8 q8, d0, d1 - .endm - - .macro SAD_START_8 align:vararg -- vld1.64 {d1}, [r2 \align], r3 -+ vld1.64 {d1}, [r2\align], r3 - vld1.64 {d0}, [r0,:64], r1 - vabdl.u8 q8, d0, d1 - .endm - - .macro SAD_8 align:vararg -- vld1.64 {d1}, [r2 \align], r3 -+ vld1.64 {d1}, [r2\align], r3 - vld1.64 {d0}, [r0,:64], r1 - vabal.u8 q8, d0, d1 - .endm - - .macro SAD_START_16 align:vararg -- vld1.64 {d2-d3}, [r2 \align], r3 -+ vld1.64 {d2-d3}, [r2\align], r3 - vld1.64 {d0-d1}, [r0,:128], r1 - vabdl.u8 q8, d0, d2 -- vld1.64 {d6-d7}, [r2 \align], r3 -+ vld1.64 {d6-d7}, [r2\align], r3 - vabdl.u8 q9, d1, d3 - vld1.64 {d4-d5}, [r0,:128], r1 - .endm - - .macro SAD_16 align:vararg - vabal.u8 q8, d4, d6 -- vld1.64 {d2-d3}, [r2 \align], r3 -+ vld1.64 {d2-d3}, [r2\align], r3 - vabal.u8 q9, d5, d7 - vld1.64 {d0-d1}, [r0,:128], r1 - vabal.u8 q8, d0, d2 -- vld1.64 {d6-d7}, [r2 \align], r3 -+ vld1.64 {d6-d7}, [r2\align], r3 - vabal.u8 q9, d1, d3 - vld1.64 {d4-d5}, [r0,:128], r1 - .endm --- -1.7.10.4 - |