From nobody Tue Dec 13 21:27:24 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 4NWs5m4SFpz4jZS3; Tue, 13 Dec 2022 21:27:24 +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 4NWs5m2wzNz3jHL; Tue, 13 Dec 2022 21:27:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670966844; 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=QvS19d3WfCNpUqTRPlySWE+CTldfE5cWNlhwqrDYbsw=; b=nSP8Ka/Ij+bqWEFe2u9f5YzNIdIW4/yOn9oGJh7PSAY692a8Y+arCYShpU+zDZGiq+hp6c V5jNZFbxDMv/YTAfYzxv6zUSqi/wG8a9EQGRtoJCSgSccn97r7lvD4Nu1Q7nFPozkov+aE 8xWv0xFkr4BLZnTqwO0Oyi69motw2y/h1gSSJInDfXhpuGgUO5kcTyT/pf8NNJlz+tI6WB PRb2eIsD9X3GZHYSrUyLa62rLJVgv5uxvR3qqeMr+2HJLmd7ZGlUOG7UHPedqQOwqsy3KH 4KWTN97AJGYocKKyMpjs788Y6GwSvLtS3hAwBvdq04wopoTlfc5vcqTBcoEu/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670966844; 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=QvS19d3WfCNpUqTRPlySWE+CTldfE5cWNlhwqrDYbsw=; b=X+NAkNxqoSTiecErpSHrd+CeRbZFgU15QPQtWC9KGD186h2g2WzIHDoOKECAU86vOK9iLw ieRfB5YYfXyXYJwZeJWyOH0A4ePd12X97PcOO+2o/6geEGfewqRv0T94bhEEkYC0o7Twtj p2xt7oUkF2M8W51fJENfuaApnNJd9ryniJEDyuhAKvAn9IJiQd/K9ntXcysX0tBHmt0z/K cAc2rtYZmdQLZ6N0obOnzcnjrl9IZpoWHPcc/ZlMI4s46k25T+TJWoL+adB/nuIg1+812T X5a4KSf+Drc/EfCTtvN8BJAmdgv2G3rntk8BSOBhqJP9W8OeRw82ldrLHb35hA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1670966844; a=rsa-sha256; cv=none; b=TfwgEANLSZibP5OsfMeRZ0B9YesMv0vfTg8VtoHBhVzHSFtvbPpK7lzZPlXlox7l/QC8SC e7LgpAEGsf66i/9FT0uew5IljfcrDsG8FQX83lDST7hhc7sMnEKa6azj6K/IMUrOcuCeQa r4MDekMWQhpIR6t2/yaEMCrijd6Uq/nvettHztaPLd30Z0Im4ZqwQ98KyCZycIMRNvwbh5 LDdI/Vg5C3ufSO4aXqMVUz1ODnukardn2eltTfp33PGGTtQ+lz+Yt+ykioCj9VdFEhmxkJ RgaGeFxlZs1kOS2ACTrvpGAe9zG6JxdVr1I2ocXENrqAELKBAkcOgqsg9A0GnQ== 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 4NWs5m1Lp5zTM1; Tue, 13 Dec 2022 21:27:24 +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 2BDLROuF022613; Tue, 13 Dec 2022 21:27:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2BDLROXp022612; Tue, 13 Dec 2022 21:27:24 GMT (envelope-from git) Date: Tue, 13 Dec 2022 21:27:24 GMT Message-Id: <202212132127.2BDLROXp022612@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Thomas Zander Subject: git: ce951d576902 - main - multimedia/avidemux: Fix build on i386 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: riggs X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ce951d576902bed95c66da651dd68d71dca4cd1c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by riggs: URL: https://cgit.FreeBSD.org/ports/commit/?id=ce951d576902bed95c66da651dd68d71dca4cd1c commit ce951d576902bed95c66da651dd68d71dca4cd1c Author: Thomas Zander AuthorDate: 2022-12-13 19:21:06 +0000 Commit: Thomas Zander CommitDate: 2022-12-13 21:27:20 +0000 multimedia/avidemux: Fix build on i386 Details: - Do not unconditionally (and broken on gcc12) use SSE. --- multimedia/avidemux/Makefile.common | 7 +++++-- multimedia/avidemux/files/extra-patch-i386-nosse | 14 ++++++++++++++ 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/multimedia/avidemux/Makefile.common b/multimedia/avidemux/Makefile.common index e71a4f3e5de4..5725e2a276fa 100644 --- a/multimedia/avidemux/Makefile.common +++ b/multimedia/avidemux/Makefile.common @@ -73,9 +73,12 @@ OPTIONS_DEFAULT+= LAME FAAC AMR X264 # of the stack) .if ${ARCH} == amd64 CFLAGS+= -fno-omit-frame-pointer -#MAKE_ENV+= ARCH=x86_64 -#CONFIGURE_ENV+= ARCH=x86_64 .endif + +.if ${ARCH} == i386 +EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-i386-nosse +.endif + CMAKE_ARGS+= -DLIBEXECINFO_INCLUDE_DIR=/usr/include CMAKE_ARGS+= -DLIBEXECINFO_LIBRARY_DIR=-lexecinfo diff --git a/multimedia/avidemux/files/extra-patch-i386-nosse b/multimedia/avidemux/files/extra-patch-i386-nosse new file mode 100644 index 000000000000..fbad75fb59ae --- /dev/null +++ b/multimedia/avidemux/files/extra-patch-i386-nosse @@ -0,0 +1,14 @@ +--- avidemux/common/ADM_audioFilter/src/ADM_soundtouch/STTypes.h.orig 2022-09-17 13:59:16 UTC ++++ avidemux/common/ADM_audioFilter/src/ADM_soundtouch/STTypes.h +@@ -153,11 +153,6 @@ namespace soundtouch + // efficient autovectorization + typedef float LONG_SAMPLETYPE; + +- #ifdef SOUNDTOUCH_ALLOW_X86_OPTIMIZATIONS +- // Allow SSE optimizations +- #define SOUNDTOUCH_ALLOW_SSE 1 +- #endif +- + #endif // SOUNDTOUCH_INTEGER_SAMPLES + + #if ((SOUNDTOUCH_ALLOW_SSE) || (__SSE__) || (SOUNDTOUCH_USE_NEON))