From nobody Sun Mar 6 14:09:25 2022 X-Original-To: dev-commits-ports-all@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 6753E19FF983; Sun, 6 Mar 2022 14:09:26 +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 4KBNkZ1lxYz3Qtt; Sun, 6 Mar 2022 14:09:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646575766; 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=3X00UWItMdOG8rBiQC1IbHYCf+GQo2ViQIqyo2RveE0=; b=XoAdMEEnYQf6EYm8sMOl4tSBMQ3SkAygNyzpCzYwGrxwo8JaK/kVw8yFq9WXxY6l7nedVw op9r78MKy5RrMGdjRldrlOku5BGEhwCm+o8vhwYROU7h/5pppNidvvgvN1bm7MhtpIhQNK ZoqeZJHFje2sMDAaInar/dpMjBFTxfLHxSnAHDnrYDMoKFfIlhypZCSjUxoDpJWfAq5bLw iOPL8TG9hwXSEVdFGi9NZ2yra8Wrez8AD8eQlpxiap0Fqbu+CxLQGQek80p5Y2kTWoPKay xnqYWhH+q6gaEShFOznQvvcsfQXld7TFYdcHXt7krpzO9mbSjl+LRcW+lBn1mw== 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 0B57415564; Sun, 6 Mar 2022 14:09:26 +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 226E9P9Z079044; Sun, 6 Mar 2022 14:09:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 226E9PFM079043; Sun, 6 Mar 2022 14:09:25 GMT (envelope-from git) Date: Sun, 6 Mar 2022 14:09:25 GMT Message-Id: <202203061409.226E9PFM079043@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Jan Beich Subject: git: 7d406412033c - 2022Q1 - multimedia/svt-av1: unbreak on i386 by disabling assembly List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/2022Q1 X-Git-Reftype: branch X-Git-Commit: 7d406412033c0ccc369eae4c5cc7b26d85b7265f Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646575766; 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=3X00UWItMdOG8rBiQC1IbHYCf+GQo2ViQIqyo2RveE0=; b=k1ZD5ko1qkY2t1CAXsjNuBCJr96gSJNpOEGo2m90xLPOSwyzS0HWHLaalKgjE9hh1yg6I7 ieMPIEx9ZfOjQQ75U6fKdAyPPS0nZzNf6osg3LJLB/r1wAfxzcOgTm7jnm7HgYXUFfr3i8 d8engB9kwidcNhlNtBWvadKykjc2LGi9QUD5AOm954LVaQsmZ/APA14JQDCgyXlrSD7BQU iQwD6y7/XBdOEvITjvVk0gkJwASeHS4DtMlpBeIRdiL7FO4T7QOn9sFFlRSqx/73Ael9xY sNtGwMBTTE2lykT/WKeYSTzYb3+CeMV5dYODPOHBQLa+qzugHVzlOXFD++rQLg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646575766; a=rsa-sha256; cv=none; b=gW3oSQHd8HT8kKkZRwcWEfMMgr1sNzYpDwmdKRLgc4e2g6HRf0YxaCnrK97i6iVrz+YpbK Lw+uBzWTREh4B9BtjKjYeGQTb5W/Cd31XNlqNLn8QMdvB5CqMarnFcPvrG4HOs2453rF/N k9LfSwMtQpPen8gVEcOmZ4k/2oE2uvHd+1kiMyjLc8Z4Fcljoy8HSeWso4Ez3blNgQv4o8 DgiTLoFIP0KE/QDieR4pCmea/SOZmj+hWVzxoOj5dgoTvbSGe3e1+KSnF6WJmFcfuelUnT 6Yu6sJg/4k66D46tMxXY3bRksUKMZd1/4Pm5c7/iHYZPVBGmMzpDbmaQTTKQXw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q1 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=7d406412033c0ccc369eae4c5cc7b26d85b7265f commit 7d406412033c0ccc369eae4c5cc7b26d85b7265f Author: Jan Beich AuthorDate: 2022-03-06 09:17:23 +0000 Commit: Jan Beich CommitDate: 2022-03-06 10:17:24 +0000 multimedia/svt-av1: unbreak on i386 by disabling assembly (cherry picked from commit b3e4ac879d4026a18d671b345867d9f640705a7c) --- multimedia/svt-av1/Makefile | 2 -- multimedia/svt-av1/files/patch-i386 | 29 +++++++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 2 deletions(-) diff --git a/multimedia/svt-av1/Makefile b/multimedia/svt-av1/Makefile index a1106a164f3d..76ebf1c99208 100644 --- a/multimedia/svt-av1/Makefile +++ b/multimedia/svt-av1/Makefile @@ -16,8 +16,6 @@ LICENSE_FILE_BSD2CLAUSE= ${WRKSRC}/LICENSE.md LICENSE_FILE_BSD3CLAUSE= ${WRKSRC}/third_party/fastfeat/LICENSE LICENSE_FILE_MIT= ${WRKSRC}/third_party/safestringlib/LICENSE -BROKEN_i386= https://gitlab.com/AOMediaCodec/SVT-AV1/-/issues/1231 - BUILD_DEPENDS= nasm:devel/nasm USES= cmake compiler:c11 diff --git a/multimedia/svt-av1/files/patch-i386 b/multimedia/svt-av1/files/patch-i386 new file mode 100644 index 000000000000..b4dac76bd4ab --- /dev/null +++ b/multimedia/svt-av1/files/patch-i386 @@ -0,0 +1,29 @@ +https://gitlab.com/AOMediaCodec/SVT-AV1/-/issues/1231 + +Source/Lib/Encoder/ASM_SSE2/highbd_variance_impl_sse2.asm:41: error: impossible combination of address sizes +Source/Lib/Common/ASM_SSSE3/aom_subpixel_8t_ssse3.asm:377: error: impossible combination of address sizes +Source/Lib/Encoder/ASM_SSE4_1/pickrst_sse4.c:511:14: warning: implicit declaration of function '_mm_insert_epi64' is invalid in C99 [-Wimplicit-function-declaration] + dst[0] = _mm_insert_epi64(dst[0], *(int64_t *)src, 1); + ^ +Source/Lib/Encoder/ASM_SSE4_1/pickrst_sse4.c:511:12: error: assigning to '__m128i' (vector of 2 'long long' values) from incompatible type 'int' + dst[0] = _mm_insert_epi64(dst[0], *(int64_t *)src, 1); + ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +In file included from Source/Lib/Encoder/ASM_AVX2/pickrst_avx2.c:20: +Source/Lib/Encoder/ASM_AVX2/pickrst_avx2.h:393:12: warning: implicit declaration of function '_mm256_insert_epi64' is invalid in C99 [-Wimplicit-function-declaration] + *dst = _mm256_insert_epi64(*dst, *(int64_t *)src, 1); + ^ +Source/Lib/Encoder/ASM_AVX2/pickrst_avx2.h:393:10: error: assigning to '__m256i' (vector of 4 'long long' values) from incompatible type 'int' + *dst = _mm256_insert_epi64(*dst, *(int64_t *)src, 1); + ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +--- CMakeLists.txt.orig 2021-05-08 09:05:00 UTC ++++ CMakeLists.txt +@@ -42,7 +42,7 @@ check_c_source_compiles(" + include(CheckCSourceCompiles) + + check_c_source_compiles(" +-#if defined(_M_IX86) || defined(_M_X64) || defined(__i386__) || defined(__x86_64__) ++#if defined(_M_X64) || defined(__x86_64__) + #else + #error \"Non-x86\" + #endif