From nobody Tue Aug 29 12:59:30 2023 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 4RZnZB5SwFz4rmd1; Tue, 29 Aug 2023 12:59:30 +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 4RZnZB4x8Hz3Gqg; Tue, 29 Aug 2023 12:59:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693313970; 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=oLQT2fO+zXJLPSA0fmDoXyLHLQe2p3Bzd1grsSPlDQY=; b=nsq8U780acTZqg8qpbohQGZwwbAcO3cuZCzNgThgAVNgHv4IZFiYIPFtvKU92s2xmEok5W IFEfmdS7lzfLC5JvzhD0XGo5iCrcwdeuyVHhf5w5bXpRPw1Dwofr/m++Uw2vaE2bT1PJU2 SsAIcQ8Dl+SvWkxYCTIMwD0+z6NQ6cCicOKCtk2eBSTLGU53H54nXf2hue1NpaW+2wDDoC YyJ59SeAQ7DjssGi+NDgnoXF+4CUZDbDsksqzrKyFPTGC2OXAClY41+wp2c7wz45nEa3B8 D+mT1sG5roE5wO4oFXyPWM67Mn2OCLBCtLpTEw7KBxz1pZ7Vq92QQI96sRxjZw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693313970; a=rsa-sha256; cv=none; b=rkyrbmjf+PXrgyfaeRKjlNEJwzG9kF+C+CjhKbnBgozKkuutIPR2tlyo3Z+KRNdB66phxe zhm+nN9crHQWf6BKmGiU0ENOZ5cu9dr/j+lPr7FgPPtunHExssOUcu8JktJ7cWt3xfcd7Y xxa6wIwRHSZtbW0tQAcjOXf/cLZCtKMFjXwcns9dtdIFwYhTEWFIhQdx1hKHQ0yy1b/NAd Dc91InM6FIR+RvxMQbY8sl7kWmIUP5NxVW9xOAm6AS1qydTBlkhPyM2HkJqBIOgyvF0N6S OK9hvDNufM09OQF7BZE9KEmdRx98Sg+iNlI/JSCA7KdThOQxjCqccQnKUhv0Sw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693313970; 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=oLQT2fO+zXJLPSA0fmDoXyLHLQe2p3Bzd1grsSPlDQY=; b=YP1YgH6eKnibObtlGxdzg/tDCd3/cD5KAZQNV9Y4qhW3H9oL6I7ZlKjQgaP17WPjAVM0R7 /TNz8fBreiuMYPzf1pbGILSpw+mlxl0XAXHNoSBrmn+iCOTsfmFMckIVqUVHpklgN/KHvY LOoFAptgBNIXZGzy1BSPGN+KZIbqDMTOU6Dr7QP2b1Z/EvTlq4BtNO7QQUX1HTp4JvJR6A /ux+2CVHOcpmADA2XltSFJfzhqOTMWHzA9yCcMIDG+/iAy3lk4ngg9qFq0IdyIfjY4OaAs x0+IwXp99D6FX2TtTTj3o8QCDdkfJsxjMX6R0ZRh+nqc7oe8YHCNUPnMYxF19g== 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 4RZnZB3zsHzsDh; Tue, 29 Aug 2023 12:59:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37TCxUbX009398; Tue, 29 Aug 2023 12:59:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37TCxUSU009395; Tue, 29 Aug 2023 12:59:30 GMT (envelope-from git) Date: Tue, 29 Aug 2023 12:59:30 GMT Message-Id: <202308291259.37TCxUSU009395@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Robert Nagy Subject: git: fef6b65345f7 - main - multimedia/ffmpeg*: enable support for the .data.rel.ro section 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: rnagy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fef6b65345f7e6c629d57e37c92509043106ceec Auto-Submitted: auto-generated The branch main has been updated by rnagy: URL: https://cgit.FreeBSD.org/ports/commit/?id=fef6b65345f7e6c629d57e37c92509043106ceec commit fef6b65345f7e6c629d57e37c92509043106ceec Author: Robert Nagy AuthorDate: 2023-08-27 21:04:02 +0000 Commit: Robert Nagy CommitDate: 2023-08-29 12:59:18 +0000 multimedia/ffmpeg*: enable support for the .data.rel.ro section enable support for the .data.rel.ro section because the arm64 assembly code in ffmpeg depends on it in case of -pie and -fPIC Reviewed by: jbeich Differential Revision: https://reviews.freebsd.org/D41609 --- multimedia/ffmpeg/Makefile | 2 +- multimedia/ffmpeg/files/patch-configure | 14 +++++++++++--- multimedia/ffmpeg4/Makefile | 2 +- multimedia/ffmpeg4/files/patch-configure | 14 +++++++++++--- 4 files changed, 24 insertions(+), 8 deletions(-) diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile index f2ce2b01b1cb..4a9b4525a663 100644 --- a/multimedia/ffmpeg/Makefile +++ b/multimedia/ffmpeg/Makefile @@ -1,6 +1,6 @@ PORTNAME= ffmpeg PORTVERSION= 6.0 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= multimedia audio net MASTER_SITES= https://ffmpeg.org/releases/ diff --git a/multimedia/ffmpeg/files/patch-configure b/multimedia/ffmpeg/files/patch-configure index 760c50b8e912..01ac4da79840 100644 --- a/multimedia/ffmpeg/files/patch-configure +++ b/multimedia/ffmpeg/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig 2022-10-09 19:04:43 UTC +--- configure.orig 2023-02-27 20:43:45 UTC +++ configure -@@ -3784,13 +3784,7 @@ host_os=$target_os_default +@@ -3888,13 +3888,7 @@ target_os_default=$(tolower $(uname -s)) host_os=$target_os_default # machine @@ -15,7 +15,15 @@ cpu="generic" intrinsics="none" -@@ -6758,7 +6752,7 @@ if enabled x86; then +@@ -5537,6 +5531,7 @@ case $target_os in + disable symver + ;; + freebsd) ++ enable section_data_rel_ro + ;; + bsd/os) + add_extralibs -lpoll -lgnugetopt +@@ -7018,7 +7013,7 @@ fi if enabled x86; then case $target_os in diff --git a/multimedia/ffmpeg4/Makefile b/multimedia/ffmpeg4/Makefile index f7960915bde3..a317fd47e223 100644 --- a/multimedia/ffmpeg4/Makefile +++ b/multimedia/ffmpeg4/Makefile @@ -1,6 +1,6 @@ PORTNAME= ffmpeg PORTVERSION= 4.4.4 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= multimedia audio net MASTER_SITES= https://ffmpeg.org/releases/ PKGNAMESUFFIX= 4 diff --git a/multimedia/ffmpeg4/files/patch-configure b/multimedia/ffmpeg4/files/patch-configure index 760c50b8e912..0488acd7f18b 100644 --- a/multimedia/ffmpeg4/files/patch-configure +++ b/multimedia/ffmpeg4/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig 2022-10-09 19:04:43 UTC +--- configure.orig 2023-04-12 18:52:51 UTC +++ configure -@@ -3784,13 +3784,7 @@ host_os=$target_os_default +@@ -3784,13 +3784,7 @@ target_os_default=$(tolower $(uname -s)) host_os=$target_os_default # machine @@ -15,7 +15,15 @@ cpu="generic" intrinsics="none" -@@ -6758,7 +6752,7 @@ if enabled x86; then +@@ -5387,6 +5381,7 @@ case $target_os in + disable symver + ;; + freebsd) ++ enable section_data_rel_ro + ;; + bsd/os) + add_extralibs -lpoll -lgnugetopt +@@ -6758,7 +6753,7 @@ enabled vulkan && if enabled x86; then case $target_os in