From nobody Tue May 02 09:42:05 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q9ZqL2R1Cz48mBF; Tue, 2 May 2023 09:42:06 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Q9ZqL0XcQz3L3x; Tue, 2 May 2023 09:42:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683020526; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EtOe1EtTZM6iHKN0x7IQ1YogEuywyakHYBQgmMmM0/M=; b=SD4xrCO3CFi5JDcfpjVi4yUfeNswfkuBYf3M+Of9zD5UUJ8Mc05T2WSyR2PuMl3iXaHKY3 PRNJTHikktdD8k2j8ExfWE45db36maBDdWvuw2czyGS4sVbjtTPMnO9iaYJmAyqSZ4bIlr EE2UiOUd0pdd+SlZmZNA83zOEGUf8ruAgTy+O00XAuP8K6ptE4axyAtkqf6HhI33AFoZ/n G1LqxslhWKsHSVpA+qO9wUoTnsBMqmENjvFszWaLdRZERADq1eupBzPOk/KIDr+VmzScTq pIRR7wl7zWVPML4oG5tZj3GNzHE+dq1a0b9PTtsjAcTM+LVAQDC4zcaN6qIaAQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683020526; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EtOe1EtTZM6iHKN0x7IQ1YogEuywyakHYBQgmMmM0/M=; b=ytVIPArmNora/Vywv1TezyXC9tFHFWajrdPAYFUX3PM+LpaZRUtBYVdOX2IRI6XQNkmud9 470HquFfXAW5rlxMpOvcrBRMc9EDEkBZIXMcSG18PQ5HkIodnUkelvj1inbq8S7Ov+O19m EoMV0djX7su7T+Zcr+t3COOxBfe+W9NDRHLhyNZedbAS+labl0HhVED7xAwxO/6DhzOW9+ ur4NR5grEHB3FYanUdYctkK9JoEjuBIB6kPM8LAVX1kp82i1OmOwJga+wivG7wDBL2Qn6P lqLhPEou7V75KPysSSzFffg3hf6UfweW4vyYnHXz1mOZWtFqWYglypBoLjxXrw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683020526; a=rsa-sha256; cv=none; b=U6WxQzsTK5odjbAFmeacOHYRU6tpaHPnysGMHU72bAC7/47s9JO3kjksZ4v20w0Pn7eAoq L9WAvzuSeU+TYTfrxsqasb3CB13B0yC9zDu83w+42/N8tODZjF0VNDJ5rYkC5qH7y7ofz/ CxtmI4hQwBZm70zNh0jB4wzfVNC5k9Or6LG6ReAfy0Gc+3RjIfQtkRVj28mCYTB5Wwpz2z lIS+QHpRgU86kgWBd6f5ZIrXFtztHL3qnI9rY33LLG0aQks1Nn4nRgAfihkbqHQ/GI72p1 rvO2FnR6euQxfY/agoTq5G4aNOsGn5ufdgavVTtK3oC50qDgg5GCjPx1kVHUcA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q9ZqK6lTjzjks; Tue, 2 May 2023 09:42:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 3429g5IW007370; Tue, 2 May 2023 09:42:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3429g5Rs007369; Tue, 2 May 2023 09:42:05 GMT (envelope-from git) Date: Tue, 2 May 2023 09:42:05 GMT Message-Id: <202305020942.3429g5Rs007369@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Piotr Kubaj Subject: git: c2d6756b1918 - main - multimedia/mythtv: fix build on powerpc64* List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pkubaj X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c2d6756b1918b1c2afb5bc9d4c9cbb1c031b7f70 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=c2d6756b1918b1c2afb5bc9d4c9cbb1c031b7f70 commit c2d6756b1918b1c2afb5bc9d4c9cbb1c031b7f70 Author: Piotr Kubaj AuthorDate: 2023-05-02 09:39:46 +0000 Commit: Piotr Kubaj CommitDate: 2023-05-02 09:39:46 +0000 multimedia/mythtv: fix build on powerpc64* --- ...ternal_FFmpeg_libswscale_ppc_yuv2rgb__altivec.c | 145 +++++++++++++++++++++ 1 file changed, 145 insertions(+) diff --git a/multimedia/mythtv/files/patch-external_FFmpeg_libswscale_ppc_yuv2rgb__altivec.c b/multimedia/mythtv/files/patch-external_FFmpeg_libswscale_ppc_yuv2rgb__altivec.c new file mode 100644 index 000000000000..1208098c1e5d --- /dev/null +++ b/multimedia/mythtv/files/patch-external_FFmpeg_libswscale_ppc_yuv2rgb__altivec.c @@ -0,0 +1,145 @@ +Revert 3a557c5d88b7b15b5954ba2743febb055549b536 to fix build on powerpc and powerpc64. + +Error: +CC libswscale/ppc/yuv2rgb_altivec.o +libswscale/ppc/yuv2rgb_altivec.c: In function ?altivec_yuv2_abgr?: +libswscale/ppc/yuv2rgb_altivec.c:338:18: error: implicit declaration of function ?vec_xl?; did you mean ?vec_rl?? [-Werror=implicit-function-declaration] + 338 | y0 = vec_xl(0, y1i); \ + | ^~~~~~ +libswscale/ppc/yuv2rgb_altivec.c:437:1: note: in expansion of macro ?DEFCSP420_CVT? + 437 | DEFCSP420_CVT(yuv2_abgr, out_abgr) + | ^~~~~~~~~~~~~ +libswscale/ppc/yuv2rgb_altivec.c:338:18: error: incompatible types when assigning to type ?__vector unsigned char? {aka ?__vector(16) unsigned char?} from type ?int? + 338 | y0 = vec_xl(0, y1i); \ + | ^~~~~~ +libswscale/ppc/yuv2rgb_altivec.c:437:1: note: in expansion of macro ?DEFCSP420_CVT? + 437 | DEFCSP420_CVT(yuv2_abgr, out_abgr) + | ^~~~~~~~~~~~~ +libswscale/ppc/yuv2rgb_altivec.c:340:18: error: incompatible types when assigning to type ?__vector unsigned char? {aka ?__vector(16) unsigned char?} from type ?int? + 340 | y1 = vec_xl(0, y2i); \ + | ^~~~~~ +libswscale/ppc/yuv2rgb_altivec.c:437:1: note: in expansion of macro ?DEFCSP420_CVT? + 437 | DEFCSP420_CVT(yuv2_abgr, out_abgr) + | ^~~~~~~~~~~~~ +libswscale/ppc/yuv2rgb_altivec.c:437:1: error: can?t convert a value of type ?int? to vector type ?__vector(16) signed char? which has different size +libswscale/ppc/yuv2rgb_altivec.c:437:1: error: can?t convert a value of type ?int? to vector type ?__vector(16) signed char? which has different size +libswscale/ppc/yuv2rgb_altivec.c: In function ?altivec_yuv2_bgra?: +libswscale/ppc/yuv2rgb_altivec.c:338:18: error: incompatible types when assigning to type ?__vector unsigned char? {aka ?__vector(16) unsigned char?} from type ?int? + 338 | y0 = vec_xl(0, y1i); \ + | ^~~~~~ +libswscale/ppc/yuv2rgb_altivec.c:438:1: note: in expansion of macro ?DEFCSP420_CVT? + 438 | DEFCSP420_CVT(yuv2_bgra, out_bgra) + | ^~~~~~~~~~~~~ +libswscale/ppc/yuv2rgb_altivec.c:340:18: error: incompatible types when assigning to type ?__vector unsigned char? {aka ?__vector(16) unsigned char?} from type ?int? + 340 | y1 = vec_xl(0, y2i); \ + | ^~~~~~ +libswscale/ppc/yuv2rgb_altivec.c:438:1: note: in expansion of macro ?DEFCSP420_CVT? + 438 | DEFCSP420_CVT(yuv2_bgra, out_bgra) + | ^~~~~~~~~~~~~ +libswscale/ppc/yuv2rgb_altivec.c:438:1: error: can?t convert a value of type ?int? to vector type ?__vector(16) signed char? which has different size +libswscale/ppc/yuv2rgb_altivec.c:438:1: error: can?t convert a value of type ?int? to vector type ?__vector(16) signed char? which has different size +libswscale/ppc/yuv2rgb_altivec.c: In function ?altivec_yuv2_rgba?: +libswscale/ppc/yuv2rgb_altivec.c:338:18: error: incompatible types when assigning to type ?__vector unsigned char? {aka ?__vector(16) unsigned char?} from type ?int? + 338 | y0 = vec_xl(0, y1i); \ + | ^~~~~~ +libswscale/ppc/yuv2rgb_altivec.c:439:1: note: in expansion of macro ?DEFCSP420_CVT? + 439 | DEFCSP420_CVT(yuv2_rgba, out_rgba) + | ^~~~~~~~~~~~~ +libswscale/ppc/yuv2rgb_altivec.c:340:18: error: incompatible types when assigning to type ?__vector unsigned char? {aka ?__vector(16) unsigned char?} from type ?int? + 340 | y1 = vec_xl(0, y2i); \ + | ^~~~~~ +libswscale/ppc/yuv2rgb_altivec.c:439:1: note: in expansion of macro ?DEFCSP420_CVT? + 439 | DEFCSP420_CVT(yuv2_rgba, out_rgba) + | ^~~~~~~~~~~~~ +libswscale/ppc/yuv2rgb_altivec.c:439:1: error: can?t convert a value of type ?int? to vector type ?__vector(16) signed char? which has different size +libswscale/ppc/yuv2rgb_altivec.c:439:1: error: can?t convert a value of type ?int? to vector type ?__vector(16) signed char? which has different size +libswscale/ppc/yuv2rgb_altivec.c: In function ?altivec_yuv2_argb?: +libswscale/ppc/yuv2rgb_altivec.c:338:18: error: incompatible types when assigning to type ?__vector unsigned char? {aka ?__vector(16) unsigned char?} from type ?int? + 338 | y0 = vec_xl(0, y1i); \ + | ^~~~~~ +libswscale/ppc/yuv2rgb_altivec.c:440:1: note: in expansion of macro ?DEFCSP420_CVT? + 440 | DEFCSP420_CVT(yuv2_argb, out_argb) + | ^~~~~~~~~~~~~ +libswscale/ppc/yuv2rgb_altivec.c:340:18: error: incompatible types when assigning to type ?__vector unsigned char? {aka ?__vector(16) unsigned char?} from type ?int? + 340 | y1 = vec_xl(0, y2i); \ + | ^~~~~~ +libswscale/ppc/yuv2rgb_altivec.c:440:1: note: in expansion of macro ?DEFCSP420_CVT? + 440 | DEFCSP420_CVT(yuv2_argb, out_argb) + | ^~~~~~~~~~~~~ +libswscale/ppc/yuv2rgb_altivec.c:440:1: error: can?t convert a value of type ?int? to vector type ?__vector(16) signed char? which has different size +libswscale/ppc/yuv2rgb_altivec.c:440:1: error: can?t convert a value of type ?int? to vector type ?__vector(16) signed char? which has different size +libswscale/ppc/yuv2rgb_altivec.c: In function ?altivec_yuv2_rgb24?: +libswscale/ppc/yuv2rgb_altivec.c:338:18: error: incompatible types when assigning to type ?__vector unsigned char? {aka ?__vector(16) unsigned char?} from type ?int? + 338 | y0 = vec_xl(0, y1i); \ + | ^~~~~~ +libswscale/ppc/yuv2rgb_altivec.c:441:1: note: in expansion of macro ?DEFCSP420_CVT? + 441 | DEFCSP420_CVT(yuv2_rgb24, out_rgb24) + | ^~~~~~~~~~~~~ +libswscale/ppc/yuv2rgb_altivec.c:340:18: error: incompatible types when assigning to type ?__vector unsigned char? {aka ?__vector(16) unsigned char?} from type ?int? + 340 | y1 = vec_xl(0, y2i); \ + | ^~~~~~ +libswscale/ppc/yuv2rgb_altivec.c:441:1: note: in expansion of macro ?DEFCSP420_CVT? + 441 | DEFCSP420_CVT(yuv2_rgb24, out_rgb24) + | ^~~~~~~~~~~~~ +libswscale/ppc/yuv2rgb_altivec.c:441:1: error: can?t convert a value of type ?int? to vector type ?__vector(16) signed char? which has different size +libswscale/ppc/yuv2rgb_altivec.c:441:1: error: can?t convert a value of type ?int? to vector type ?__vector(16) signed char? which has different size +libswscale/ppc/yuv2rgb_altivec.c: In function ?altivec_yuv2_bgr24?: +libswscale/ppc/yuv2rgb_altivec.c:338:18: error: incompatible types when assigning to type ?__vector unsigned char? {aka ?__vector(16) unsigned char?} from type ?int? + 338 | y0 = vec_xl(0, y1i); \ + | ^~~~~~ +libswscale/ppc/yuv2rgb_altivec.c:442:1: note: in expansion of macro ?DEFCSP420_CVT? + 442 | DEFCSP420_CVT(yuv2_bgr24, out_bgr24) + | ^~~~~~~~~~~~~ +libswscale/ppc/yuv2rgb_altivec.c:340:18: error: incompatible types when assigning to type ?__vector unsigned char? {aka ?__vector(16) unsigned char?} from type ?int? + 340 | y1 = vec_xl(0, y2i); \ + | ^~~~~~ +libswscale/ppc/yuv2rgb_altivec.c:442:1: note: in expansion of macro ?DEFCSP420_CVT? + 442 | DEFCSP420_CVT(yuv2_bgr24, out_bgr24) + | ^~~~~~~~~~~~~ +libswscale/ppc/yuv2rgb_altivec.c:442:1: error: can?t convert a value of type ?int? to vector type ?__vector(16) signed char? which has different size +libswscale/ppc/yuv2rgb_altivec.c:442:1: error: can?t convert a value of type ?int? to vector type ?__vector(16) signed char? which has different size +cc1: some warnings being treated as errors + +--- external/FFmpeg/libswscale/ppc/yuv2rgb_altivec.c.orig 2020-06-15 18:54:24 UTC ++++ external/FFmpeg/libswscale/ppc/yuv2rgb_altivec.c +@@ -305,6 +305,9 @@ static int altivec_ ## name(SwsContext *c, const unsig + vector signed short R1, G1, B1; \ + vector unsigned char R, G, B; \ + \ ++ const vector unsigned char *y1ivP, *y2ivP, *uivP, *vivP; \ ++ vector unsigned char align_perm; \ ++ \ + vector signed short lCY = c->CY; \ + vector signed short lOY = c->OY; \ + vector signed short lCRV = c->CRV; \ +@@ -335,13 +338,26 @@ static int altivec_ ## name(SwsContext *c, const unsig + vec_dstst(oute, (0x02000002 | (((w * 3 + 32) / 32) << 16)), 1); \ + \ + for (j = 0; j < w / 16; j++) { \ +- y0 = vec_xl(0, y1i); \ ++ y1ivP = (const vector unsigned char *) y1i; \ ++ y2ivP = (const vector unsigned char *) y2i; \ ++ uivP = (const vector unsigned char *) ui; \ ++ vivP = (const vector unsigned char *) vi; \ + \ +- y1 = vec_xl(0, y2i); \ ++ align_perm = vec_lvsl(0, y1i); \ ++ y0 = (vector unsigned char) \ ++ vec_perm(y1ivP[0], y1ivP[1], align_perm); \ + \ +- u = (vector signed char) vec_xl(0, ui); \ ++ align_perm = vec_lvsl(0, y2i); \ ++ y1 = (vector unsigned char) \ ++ vec_perm(y2ivP[0], y2ivP[1], align_perm); \ + \ +- v = (vector signed char) vec_xl(0, vi); \ ++ align_perm = vec_lvsl(0, ui); \ ++ u = (vector signed char) \ ++ vec_perm(uivP[0], uivP[1], align_perm); \ ++ \ ++ align_perm = vec_lvsl(0, vi); \ ++ v = (vector signed char) \ ++ vec_perm(vivP[0], vivP[1], align_perm); \ + \ + u = (vector signed char) \ + vec_sub(u, \