Date: Mon, 4 Jan 2016 15:04:55 +0000 (UTC) From: Andrew Turner <andrew@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r405243 - head/multimedia/x264/files Message-ID: <201601041504.u04F4t1I031504@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: andrew (src committer) Date: Mon Jan 4 15:04:55 2016 New Revision: 405243 URL: https://svnweb.freebsd.org/changeset/ports/405243 Log: Fix x264 on AArch64. quant-a.S and deblock-a.S have syntax the LLVM assembler complains about. Pull in two upstream changes to fix these until they are on the stable branch. Without these these ports fail to build on AArch64. Approved by: koobs Differential Revision: https://reviews.freebsd.org/D4781 Added: head/multimedia/x264/files/patch-deblock-a.S (contents, props changed) head/multimedia/x264/files/patch-quant-a.S (contents, props changed) Added: head/multimedia/x264/files/patch-deblock-a.S ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/x264/files/patch-deblock-a.S Mon Jan 4 15:04:55 2016 (r405243) @@ -0,0 +1,20 @@ +--- common/aarch64/deblock-a.S.orig 2016-01-04 11:21:40.265233000 +0000 ++++ common/aarch64/deblock-a.S 2016-01-04 11:27:19.291080000 +0000 +@@ -538,7 +538,7 @@ + ret + endfunc + +-.macro h264_loop_filter_chroma_intra, width=16 ++.macro h264_loop_filter_chroma_intra width=16 + uabd v26.16b, v16.16b, v17.16b // abs(p0 - q0) + uabd v27.16b, v18.16b, v16.16b // abs(p1 - p0) + uabd v28.16b, v19.16b, v17.16b // abs(q1 - q0) +@@ -604,7 +604,7 @@ + + transpose4x4.h v18, v16, v17, v19, v26, v27, v28, v29 + +- h264_loop_filter_chroma_intra, width=8 ++ h264_loop_filter_chroma_intra width=8 + + st2 {v16.h,v17.h}[0], [x0], x1 + st2 {v16.h,v17.h}[1], [x0], x1 Added: head/multimedia/x264/files/patch-quant-a.S ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/x264/files/patch-quant-a.S Mon Jan 4 15:04:55 2016 (r405243) @@ -0,0 +1,24 @@ +--- common/aarch64/quant-a.S.orig 2016-01-04 11:28:55.378084000 +0000 ++++ common/aarch64/quant-a.S 2016-01-04 11:30:55.055050000 +0000 +@@ -546,12 +546,10 @@ + sub x0, x0, #2 + .endif + .if \size < 15 +- .equ shiftw, 3 + ld1 {v0.8h}, [x0] + uqxtn v0.8b, v0.8h + cmtst v0.8b, v0.8b, v0.8b + .else +- .equ shiftw, 2 + ld1 {v0.8h,v1.8h}, [x0] + uqxtn v0.8b, v0.8h + uqxtn2 v0.16b, v1.8h +@@ -565,7 +563,7 @@ + + coeff_level_run_start \size + +- coeff_level_run shiftw ++ coeff_level_run (4 - (\size + 1) / 8) + + ret + endfunc
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201601041504.u04F4t1I031504>