From nobody Tue Sep 13 17:14:29 2022 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 4MRqnx3hKgz4bvQ1; Tue, 13 Sep 2022 17:14:29 +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 4MRqnx37Zbz3MYf; Tue, 13 Sep 2022 17:14:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663089269; 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=XI6SGNvvQ3d3xISlyCoJMyZysxPFC1kveEbS+JU2PjQ=; b=h52uiolnpQIwcl7Z+dPHhn4W4Ti14EM1CRzjYhtS7XghdX6iGddgJSrNrToPKPtCWNiarl Zt/IpFImW7HbPro0dkAp8u4eV1gmKFNFiPN5YKH+3XKTAUKsMsM/Mp9pJm6s3EkqhrptGy aGScmh9/qchliUMNr6cKJN/goezE26K2eDN6sSPp8P4+TKGY6fJLwzyX+SwKgJ9xTy/jeA x9lRX89i+nyXX64hDW2OpvhBvnCqjQ5tEXemnixhJsCK4G0qsjSXgqixdM4hu2+Y2CpGYT laJWT/py7LKuUiwLAOeiESXWwYDiqMjwNdXPnU5CKpm8zqXek9wAQLl1hxSIDw== 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 4MRqnx2FDczPdm; Tue, 13 Sep 2022 17:14:29 +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 28DHETpM023961; Tue, 13 Sep 2022 17:14:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28DHETFx023960; Tue, 13 Sep 2022 17:14:29 GMT (envelope-from git) Date: Tue, 13 Sep 2022 17:14:29 GMT Message-Id: <202209131714.28DHETFx023960@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: 75a05b4f4a41 - 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: 75a05b4f4a413f512754e51d5ecdfb6d1523dec8 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663089269; 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=XI6SGNvvQ3d3xISlyCoJMyZysxPFC1kveEbS+JU2PjQ=; b=IX3212XeJERto0GLW32tYpfx3P5xrn40f/OogrR2F+jWADOxFd/0QWCDp66zFaW+8gZywZ YjmrDEtgZafpNS3Y/WeRJW4giVCrrDaI64turVlCUjpsJNfYRbM/TxVN3NgwYFL0IBYlJo Z7KLVA4GtYTaUtyLejg23AjCY5VUpmwBVpCaiZSM3OargGi5696dhJmjOkpqqOuueX+E0J 5JUq2KraUWT/i+YaZVqMyjJZPy3LiSzplxFj5Q9vsKp8BUVYJkK55Ni3RVhCWwzIJnPvBZ fTDURZm3jVtIsFp1114PQSMsNI/PuPQicB/okzk4k5n90C3jSckZI/9aVUNu1A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1663089269; a=rsa-sha256; cv=none; b=wBgxUgu1BNow8UACm6AjDJA0BLxZMiP4CB4eZtilyxJnKNW2rcZplwFNmSlQj9hUH1gYyG l0M2uTAKff2KaCjWuEYmxnDRGc+NaQaUQHGpjwfsookwjoiEy7TYQ1134G4hkzigpOpyCL N2TXdpvMSLI1G5jX4He7XMC06Ar8PC3vvC9XG5AWpt7shUyW3zpbWbJmxW1AJl21XvWV2E imzqLuURGX8JJKpIDpsM9ri0sVW/nD6+E90v3/ArHdhVxMLpahZe1hpkQgSYds2k06lAKc EwamsEdUj6Hk6x3DRa+0yrkXlKmlkGEgeRDTXJAoOf2AbRdSYG+7X8ZfI4vrxw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=75a05b4f4a413f512754e51d5ecdfb6d1523dec8 commit 75a05b4f4a413f512754e51d5ecdfb6d1523dec8 Author: Piotr Kubaj AuthorDate: 2022-09-13 17:04:48 +0000 Commit: Piotr Kubaj CommitDate: 2022-09-13 17:04:48 +0000 multimedia/mythtv: fix build on powerpc64 Error: libswscale/ppc/yuv2rgb_altivec.c:452:1: error: call to 'vec_xl' is ambiguous DEFCSP420_CVT(yuv2_rgb24, out_rgb24) ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ libswscale/ppc/yuv2rgb_altivec.c:353:38: note: expanded from macro 'DEFCSP420_CVT' u = (vector signed char) vec_xl(0, ui); \ ^~~~~~ /usr/lib/clang/13.0.0/include/altivec.h:17562:1: note: candidate function vec_xl(ptrdiff_t __offset, const unsigned char *__ptr) { ^ Additionaly, a merge of https://github.com/MythTV/mythtv/commit/8960641b32f751b8198ace9bbfc3378dac20c061 is necessary. --- ...-external_FFmpeg_libswscale_ppc_yuv2rgb__altivec.c | 11 +++++++++++ .../patch-libs_libmyth_audio_audiooutpututil.cpp | 14 ++++++++++++++ .../files/patch-libs_libmyth_audio_eldutils.cpp | 17 +++++++++++++++++ .../patch-libs_libmythtv_io_mythavformatwriter.cpp | 11 +++++++++++ ...h-libs_libmythtv_recorders_NuppelVideoRecorder.cpp | 19 +++++++++++++++++++ 5 files changed, 72 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..d9938c7f7fc5 --- /dev/null +++ b/multimedia/mythtv/files/patch-external_FFmpeg_libswscale_ppc_yuv2rgb__altivec.c @@ -0,0 +1,11 @@ +--- external/FFmpeg/libswscale/ppc/yuv2rgb_altivec.c.orig 2022-09-13 01:58:14 UTC ++++ external/FFmpeg/libswscale/ppc/yuv2rgb_altivec.c +@@ -284,7 +284,7 @@ static inline void cvtyuvtoRGB(SwsContext *c, vector s + * ------------------------------------------------------------------------------ + */ + +-#if !HAVE_VSX ++#if !HAVE_VSX && !defined(__clang__) + static inline vector unsigned char vec_xl(signed long long offset, const ubyte *addr) + { + const vector unsigned char *v_addr = (const vector unsigned char *) (addr + offset); diff --git a/multimedia/mythtv/files/patch-libs_libmyth_audio_audiooutpututil.cpp b/multimedia/mythtv/files/patch-libs_libmyth_audio_audiooutpututil.cpp new file mode 100644 index 000000000000..8b3a653f828e --- /dev/null +++ b/multimedia/mythtv/files/patch-libs_libmyth_audio_audiooutpututil.cpp @@ -0,0 +1,14 @@ +--- libs/libmyth/audio/audiooutpututil.cpp.orig 2022-08-13 16:59:56 UTC ++++ libs/libmyth/audio/audiooutpututil.cpp +@@ -212,9 +212,9 @@ char *AudioOutputUtil::GeneratePinkFrames(char *frames + static_cast(0x03fffffff); + int32_t ires = res; + if (bits == 16) +- *samp16++ = qToLittleEndian(ires >> 16); ++ *samp16++ = qToLittleEndian(ires >> 16); + else +- *samp32++ = qToLittleEndian(ires); ++ *samp32++ = qToLittleEndian(ires); + } + else + { diff --git a/multimedia/mythtv/files/patch-libs_libmyth_audio_eldutils.cpp b/multimedia/mythtv/files/patch-libs_libmyth_audio_eldutils.cpp new file mode 100644 index 000000000000..b88b52454706 --- /dev/null +++ b/multimedia/mythtv/files/patch-libs_libmyth_audio_eldutils.cpp @@ -0,0 +1,17 @@ +--- libs/libmyth/audio/eldutils.cpp.orig 2022-08-13 16:59:56 UTC ++++ libs/libmyth/audio/eldutils.cpp +@@ -257,11 +257,11 @@ int eld::update_eld(const char *buf, int size) + m_e.aud_synch_delay = GRAB_BITS(buf, 6, 0, 8) * 2; + m_e.spk_alloc = GRAB_BITS(buf, 7, 0, 7); + +- m_e.port_id = qFromLittleEndian(buf + 8); ++ m_e.port_id = qFromLittleEndian(buf + 8); + + /* not specified, but the spec's tendency is little endian */ +- m_e.manufacture_id = qFromLittleEndian(buf + 16); +- m_e.product_id = qFromLittleEndian(buf + 18); ++ m_e.manufacture_id = qFromLittleEndian(buf + 16); ++ m_e.product_id = qFromLittleEndian(buf + 18); + + if (ELD_FIXED_BYTES + mnl > size) + { diff --git a/multimedia/mythtv/files/patch-libs_libmythtv_io_mythavformatwriter.cpp b/multimedia/mythtv/files/patch-libs_libmythtv_io_mythavformatwriter.cpp new file mode 100644 index 000000000000..75264d47e3b0 --- /dev/null +++ b/multimedia/mythtv/files/patch-libs_libmythtv_io_mythavformatwriter.cpp @@ -0,0 +1,11 @@ +--- libs/libmythtv/io/mythavformatwriter.cpp.orig 2022-08-13 16:59:56 UTC ++++ libs/libmythtv/io/mythavformatwriter.cpp +@@ -270,7 +270,7 @@ int MythAVFormatWriter::WriteAudioFrame(unsigned char + #if (Q_BYTE_ORDER == Q_BIG_ENDIAN) + auto buf16 = reinterpret_cast(Buffer); + for (int i = 0; i < m_audioChannels * m_audioFrameSize; i++) +- buf16[i] = qFromLittleEndian(buf16[i]); ++ buf16[i] = qFromLittleEndian(buf16[i]); + #endif + + AVCodecContext *avctx = m_codecMap.GetCodecContext(m_audioStream); diff --git a/multimedia/mythtv/files/patch-libs_libmythtv_recorders_NuppelVideoRecorder.cpp b/multimedia/mythtv/files/patch-libs_libmythtv_recorders_NuppelVideoRecorder.cpp new file mode 100644 index 000000000000..0bfd90950486 --- /dev/null +++ b/multimedia/mythtv/files/patch-libs_libmythtv_recorders_NuppelVideoRecorder.cpp @@ -0,0 +1,19 @@ +--- libs/libmythtv/recorders/NuppelVideoRecorder.cpp.orig 2022-08-13 16:59:56 UTC ++++ libs/libmythtv/recorders/NuppelVideoRecorder.cpp +@@ -16,6 +16,7 @@ + #include + + #include ++#include + + #include + +@@ -2558,7 +2559,7 @@ void NuppelVideoRecorder::WriteAudio(unsigned char *bu + #if (Q_BYTE_ORDER == Q_BIG_ENDIAN) + auto buf16 = reinterpret_cast(buf); + for (int i = 0; i < m_audioChannels * sample_cnt; i++) +- buf16[i] = qToLittleEndian(buf16[i]); ++ buf16[i] = qToLittleEndian(buf16[i]); + #endif + if (m_audioChannels == 2) + {