CVS commit: pkgsrc/multimedia/ffmpeg4

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Fri Jun 26 21:02:27 UTC 2020

Modified Files:
        pkgsrc/multimedia/ffmpeg4: Makefile
        pkgsrc/multimedia/ffmpeg4/patches: patch-configure

Log Message:
ffmpeg4: Enable section_data_rel_ro on NetBSD

Seems to resolve text relocation issues on aarch64.

Thanks to an upstream commit fixing the exact problem we're having
(on Linux...) from 2014 for the hitn...

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 pkgsrc/multimedia/ffmpeg4/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/multimedia/ffmpeg4/patches/patch-configure

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/multimedia/ffmpeg4/Makefile
diff -u pkgsrc/multimedia/ffmpeg4/Makefile:1.32 pkgsrc/multimedia/ffmpeg4/Makefile:1.33
--- pkgsrc/multimedia/ffmpeg4/Makefile:1.32     Fri Jun 26 03:11:40 2020
+++ pkgsrc/multimedia/ffmpeg4/Makefile  Fri Jun 26 21:02:27 2020
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.32 2020/06/26 03:11:40 jklos Exp $
+# $NetBSD: Makefile,v 1.33 2020/06/26 21:02:27 nia Exp $
 
 PKGNAME=       ${DISTNAME:S/ffmpeg/ffmpeg4/}
+PKGREVISION=   1
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://ffmpeg.org/
 COMMENT=       Decoding, encoding and streaming software (v4.x)
@@ -50,10 +51,6 @@ CFLAGS+=             -mstackrealign -mpreferred-sta
 NOT_PAX_MPROTECT_SAFE+=        bin/ffmpeg4
 .endif
 
-.if ${MACHINE_ARCH} == "aarch64"
-NOT_PAX_MPROTECT_SAFE+= bin/ffmpeg4
-.endif
-
 # configure script uses uname -m to detect arch, as opposed to uname -p in
 # GNU/configure. Unable to detect NetBSD/macppc hosts correctly.
 CONFIGURE_ARGS+=       --arch=${MACHINE_ARCH}

Index: pkgsrc/multimedia/ffmpeg4/patches/patch-configure
diff -u pkgsrc/multimedia/ffmpeg4/patches/patch-configure:1.5 pkgsrc/multimedia/ffmpeg4/patches/patch-configure:1.6
--- pkgsrc/multimedia/ffmpeg4/patches/patch-configure:1.5       Tue Jun 16 16:54:45 2020
+++ pkgsrc/multimedia/ffmpeg4/patches/patch-configure   Fri Jun 26 21:02:27 2020
@@ -1,8 +1,10 @@
-$NetBSD: patch-configure,v 1.5 2020/06/16 16:54:45 adam Exp $
+$NetBSD: patch-configure,v 1.6 2020/06/26 21:02:27 nia Exp $
 
 Sun audio support.
 
-Enable PIC on NetBSD, even on i386 to avoid text relocations.
+Enable PIC and section_data_rel_ro on NetBSD, even on i386,
+to avoid text relocations.
+
 Do not use 'rsync'.
 
 Portability fixes.
@@ -46,15 +48,16 @@ Portability fixes.
                          expensive_optimization_flag=""
                      else
                          expensive_optimization_flag="-fno-expensive-optimizations"
-@@ -5330,6 +5332,7 @@ case $target_os in
+@@ -5330,6 +5332,8 @@ case $target_os in
          ;;
      netbsd)
          disable symver
++        enable section_data_rel_ro
 +        enable pic
          oss_indev_extralibs="-lossaudio"
          oss_outdev_extralibs="-lossaudio"
          enabled gcc || check_ldflags -Wl,-zmuldefs
-@@ -5728,10 +5731,13 @@ done
+@@ -5728,10 +5732,13 @@ done
  check_cc pragma_deprecated "" '_Pragma("GCC diagnostic ignored \"-Wdeprecated-declarations\"")'
  
  # The global variable ensures the bits appear unchanged in the object file.
@@ -71,7 +74,7 @@ Portability fixes.
  
  check_cc const_nan math.h "struct { double d; } static const bar[] = { { NAN } }"
  
-@@ -6114,6 +6120,7 @@ check_headers malloc.h
+@@ -6114,6 +6121,7 @@ check_headers malloc.h
  check_headers mftransform.h
  check_headers net/udplite.h
  check_headers poll.h
@@ -79,7 +82,7 @@ Portability fixes.
  check_headers sys/param.h
  check_headers sys/resource.h
  check_headers sys/select.h
-@@ -6537,7 +6544,6 @@ enabled makeinfo \
+@@ -6537,7 +6545,6 @@ enabled makeinfo \
  disabled makeinfo_html && texi2html --help 2> /dev/null | grep -q 'init-file' && enable texi2html || disable texi2html
  perl -v            > /dev/null 2>&1 && enable perl      || disable perl
  pod2man --help     > /dev/null 2>&1 && enable pod2man   || disable pod2man