git: fef6b65345f7 - main - multimedia/ffmpeg*: enable support for the .data.rel.ro section

From: Robert Nagy <rnagy_at_FreeBSD.org>
Date: Tue, 29 Aug 2023 12:59:30 UTC
The branch main has been updated by rnagy:

URL: https://cgit.FreeBSD.org/ports/commit/?id=fef6b65345f7e6c629d57e37c92509043106ceec

commit fef6b65345f7e6c629d57e37c92509043106ceec
Author:     Robert Nagy <rnagy@FreeBSD.org>
AuthorDate: 2023-08-27 21:04:02 +0000
Commit:     Robert Nagy <rnagy@FreeBSD.org>
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