From owner-svn-ports-head@freebsd.org Fri Aug 23 13:26:29 2019 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 7958EC5328; Fri, 23 Aug 2019 13:26:29 +0000 (UTC) (envelope-from riggs@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46FMcP2j35z3H5x; Fri, 23 Aug 2019 13:26:29 +0000 (UTC) (envelope-from riggs@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 39FC61D3E9; Fri, 23 Aug 2019 13:26:29 +0000 (UTC) (envelope-from riggs@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x7NDQTfC097709; Fri, 23 Aug 2019 13:26:29 GMT (envelope-from riggs@FreeBSD.org) Received: (from riggs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x7NDQTPO097708; Fri, 23 Aug 2019 13:26:29 GMT (envelope-from riggs@FreeBSD.org) Message-Id: <201908231326.x7NDQTPO097708@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: riggs set sender to riggs@FreeBSD.org using -f From: Thomas Zander Date: Fri, 23 Aug 2019 13:26:29 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r509646 - head/multimedia/ffmpeg/files X-SVN-Group: ports-head X-SVN-Commit-Author: riggs X-SVN-Commit-Paths: head/multimedia/ffmpeg/files X-SVN-Commit-Revision: 509646 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 23 Aug 2019 13:26:29 -0000 Author: riggs Date: Fri Aug 23 13:26:28 2019 New Revision: 509646 URL: https://svnweb.freebsd.org/changeset/ports/509646 Log: Fix build on ppc64 / clang. Details: - Import build fix from upstream, see: https://ffmpeg.org/pipermail/ffmpeg-devel/2019-August/247682.html https://trac.ffmpeg.org/ticket/7861 PR: 239782 Submitted by: pkubaj Added: head/multimedia/ffmpeg/files/patch-libswscale_ppc_swscale__altivec.c (contents, props changed) Added: head/multimedia/ffmpeg/files/patch-libswscale_ppc_swscale__altivec.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/ffmpeg/files/patch-libswscale_ppc_swscale__altivec.c Fri Aug 23 13:26:28 2019 (r509646) @@ -0,0 +1,55 @@ +--- libswscale/ppc/swscale_altivec.c.orig 2019-08-11 20:06:32 UTC ++++ libswscale/ppc/swscale_altivec.c +@@ -153,13 +153,13 @@ static void yuv2plane1_float_altivec(const int32_t *sr + const int add = (1 << (shift - 1)); + const int clip = (1 << 16) - 1; + const float fmult = 1.0f / 65535.0f; +- const vector uint32_t vadd = (vector uint32_t) {add, add, add, add}; +- const vector uint32_t vshift = (vector uint32_t) vec_splat_u32(shift); +- const vector uint32_t vlargest = (vector uint32_t) {clip, clip, clip, clip}; +- const vector float vmul = (vector float) {fmult, fmult, fmult, fmult}; +- const vector float vzero = (vector float) {0, 0, 0, 0}; +- vector uint32_t v; +- vector float vd; ++ const vec_u32 vadd = (vec_u32) {add, add, add, add}; ++ const vec_u32 vshift = (vec_u32) vec_splat_u32(shift); ++ const vec_u32 vlargest = (vec_u32) {clip, clip, clip, clip}; ++ const vec_f vmul = (vec_f) {fmult, fmult, fmult, fmult}; ++ const vec_f vzero = (vec_f) {0, 0, 0, 0}; ++ vec_u32 v; ++ vec_f vd; + int i; + + yuv2plane1_float_u(src, dest, dst_u, 0); +@@ -186,14 +186,14 @@ static void yuv2plane1_float_bswap_altivec(const int32 + const int add = (1 << (shift - 1)); + const int clip = (1 << 16) - 1; + const float fmult = 1.0f / 65535.0f; +- const vector uint32_t vadd = (vector uint32_t) {add, add, add, add}; +- const vector uint32_t vshift = (vector uint32_t) vec_splat_u32(shift); +- const vector uint32_t vlargest = (vector uint32_t) {clip, clip, clip, clip}; ++ const vec_u32 vadd = (vec_u32) {add, add, add, add}; ++ const vec_u32 vshift = (vec_u32) vec_splat_u32(shift); ++ const vec_u32 vlargest = (vec_u32) {clip, clip, clip, clip}; + const vector float vmul = (vector float) {fmult, fmult, fmult, fmult}; + const vector float vzero = (vector float) {0, 0, 0, 0}; +- const vector uint32_t vswapbig = (vector uint32_t) {16, 16, 16, 16}; +- const vector uint16_t vswapsmall = vec_splat_u16(8); +- vector uint32_t v; ++ const vec_u32 vswapbig = (vec_u32) {16, 16, 16, 16}; ++ const vec_u16 vswapsmall = vec_splat_u16(8); ++ vec_u32 v; + vector float vd; + int i; + +@@ -208,8 +208,8 @@ static void yuv2plane1_float_bswap_altivec(const int32 + vd = vec_ctf(v, 0); + vd = vec_madd(vd, vmul, vzero); + +- vd = (vector float) vec_rl((vector uint32_t) vd, vswapbig); +- vd = (vector float) vec_rl((vector uint16_t) vd, vswapsmall); ++ vd = (vector float) vec_rl((vec_u32) vd, vswapbig); ++ vd = (vector float) vec_rl((vec_u16) vd, vswapsmall); + + vec_st(vd, 0, (float *) &dest[i]); + }