From nobody Mon Nov 25 10:23:22 2024 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 4XxhcV4RPZz5fcYV; Mon, 25 Nov 2024 10:23:22 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XxhcV2hMgz4hKX; Mon, 25 Nov 2024 10:23:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1732530202; 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=fdpbjefgGMriORARPmKC8WyBHYKDlmHbQVSL0wyfS1w=; b=f3+qEtZDtHa1mLWQ/1o4oXU+SyMDo2LRjKMcQv5NE5WYCVEHYrbSKUMOPoqeyOQnlqvdyF UXS4KyZ9x5PX4zq/DmPsLrSzQEC26/jXEcVZrkX8dixdq7S9uP89aiZwUxplXE7u/WKrHk SdS/a2ofo/hwGdspWb0z6Y+/qyiI8xXvQMJN8o18aAcAtf2yY9eb/PALMfTbouT7Yjpzrx vwSH9Hgk+12H1GYa61hbs58QkOt1uBeqTsqAvZ3BapTki32rQ092qD0XTgqJNkNh7oKi4G DldSK6eAq09t9qIbqGxzDYHi4/iAHlEPa+G3rCb8KGVv+zBYKN0+xKRMuttwIQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1732530202; 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=fdpbjefgGMriORARPmKC8WyBHYKDlmHbQVSL0wyfS1w=; b=b1PK/K0B425jvlcs38ah9iHuhnL36S1rgafYWVTa+bhia8r7fXCzRZcUdp6/icY262/5HT y3XN7bxIsCADx4Lc4Kjcxav4q/qRSn3AoNWIFuN7uUqanQYPNgq4vdYDqBCovjOsPs9+lz FSz94hMktwS+ZrSuGxS5gwdDDnCivm2ysGvXDWKU4wgsSaMLzAWJHx9qNZBR20wl4lK754 kNVyIYnHUI5gQHxIe6qQN9itBSbmJ3oU5P8v/P+Vkx4bSS8HGwJUIexh6gCXxLo2fratzp MxhrR6tzygJQyjb82AieybsGAPkicj1j/+RVgyhiBjM5wJHrBZVyS5eEUsR+wg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1732530202; a=rsa-sha256; cv=none; b=cT5eLf74E6+cqeOBqC3z5M1VOJAXgLUr3rVTYOizhvW1uAcmmNwavTqdTfe+UTi+NumGYx JPicUs5+5MIXLhyy6T2PIZMGtgpsDRn7B+Nw4YeFcnUA2dXcmHTX+miHyY2wd0aOBzcCsx fQw1q3Jxu4XdRVh3XK9+8GjXKVinuTTOxEQKpXfVTvUo6CBWSDrLw9r68kn4MjUSsNdcES fZW+TwjnBkPYttZD6qnHgWvKWVEAfWCgG8B58RhcaO801QTgSfdNkX4/HWXI0to8PvzB00 veqY69imtjY4vzpIOf7ndtun7Ln7LNlEtzGQhInqKLCc/m7MzrAume4k5+nuYw== 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 4XxhcV1fzHzc2w; Mon, 25 Nov 2024 10:23:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4APANMJf012461; Mon, 25 Nov 2024 10:23:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4APANMKn012458; Mon, 25 Nov 2024 10:23:22 GMT (envelope-from git) Date: Mon, 25 Nov 2024 10:23:22 GMT Message-Id: <202411251023.4APANMKn012458@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Robert Clausecker Subject: git: c80d811ea8a0 - main - multimedia/avidemux: fix build on armv7 with recent binutils 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c80d811ea8a01117147be9485becbee5d6945973 Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=c80d811ea8a01117147be9485becbee5d6945973 commit c80d811ea8a01117147be9485becbee5d6945973 Author: Robert Clausecker AuthorDate: 2024-11-20 11:48:37 +0000 Commit: Robert Clausecker CommitDate: 2024-11-25 10:22:02 +0000 multimedia/avidemux: fix build on armv7 with recent binutils Recent GNU as doesn't like numerical labels that begin with leading zeros. Fix the one occurrence of such a label in the bundled FFmpeg to fix the build on armv7. MFH: 2024Q4 Approved by: portmgr (build fix blanket) --- multimedia/avidemux/Makefile.common | 7 ++++-- .../avidemux/files/ffmpeg_fix_build_on_armv7.patch | 29 ++++++++++++++++++++++ 2 files changed, 34 insertions(+), 2 deletions(-) diff --git a/multimedia/avidemux/Makefile.common b/multimedia/avidemux/Makefile.common index 4702cc112831..28821ae46e86 100644 --- a/multimedia/avidemux/Makefile.common +++ b/multimedia/avidemux/Makefile.common @@ -305,8 +305,11 @@ NOT_FOR_ARCHS= powerpc powerpc64 powerpcspe sparc64 NOT_FOR_ARCHS_REASON= cmake/admDetermineSystem.cmake:78: CPU not supported post-extract: - @${CP} ${FILESDIR}/ffmpeg_fix_build_with_binutils_2.41.patch \ - ${WRKSRC}/avidemux_core/ffmpeg_package/patches +.for p in ffmpeg_fix_build_with_binutils_2.41.patch ffmpeg_fix_build_on_armv7.patch + @${CP} ${FILESDIR}/$p \ + ${WRKSRC}/avidemux_core/ffmpeg_package/patches/ +.endfor + post-patch: @${MKDIR} ${CONFIGURE_WRKSRC}/config diff --git a/multimedia/avidemux/files/ffmpeg_fix_build_on_armv7.patch b/multimedia/avidemux/files/ffmpeg_fix_build_on_armv7.patch new file mode 100644 index 000000000000..3510ca86b757 --- /dev/null +++ b/multimedia/avidemux/files/ffmpeg_fix_build_on_armv7.patch @@ -0,0 +1,29 @@ +--- libavcodec/arm/mlpdsp_armv5te.S.orig 2024-11-20 11:30:59.957498000 +0000 ++++ libavcodec/arm/mlpdsp_armv5te.S 2024-11-20 11:31:40.969226000 +0000 +@@ -229,7 +229,7 @@ + .endif + + // Begin loop +-01: ++1: + .if TOTAL_TAPS == 0 + // Things simplify a lot in this case + // In fact this could be pipelined further if it's worth it... +@@ -241,7 +241,7 @@ + str ST0, [PST, #-4]! + str ST0, [PST, #4 * (MAX_BLOCKSIZE + MAX_FIR_ORDER)] + str ST0, [PSAMP], #4 * MAX_CHANNELS +- bne 01b ++ bne 1b + .else + .if \fir_taps & 1 + .set LOAD_REG, 1 +@@ -333,7 +333,7 @@ + str ST3, [PST, #-4]! + str ST2, [PST, #4 * (MAX_BLOCKSIZE + MAX_FIR_ORDER)] + str ST3, [PSAMP], #4 * MAX_CHANNELS +- bne 01b ++ bne 1b + .endif + b 99f +