diff options
| author | nia <nia@pkgsrc.org> | 2020-06-26 21:19:16 +0000 |
|---|---|---|
| committer | nia <nia@pkgsrc.org> | 2020-06-26 21:19:16 +0000 |
| commit | 912183ba82fc07744f6e54904a6a33a8d96a2a49 (patch) | |
| tree | bb4a7f1c5073ce79612196ef297014550b9337be /multimedia | |
| parent | ea15b377ce79f1cb7a76b9c451906d2ae7e5935d (diff) | |
| download | pkgsrc-912183ba82fc07744f6e54904a6a33a8d96a2a49.tar.gz | |
ffmpeg3: 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 hint...
Bump PKGREVISION.
Diffstat (limited to 'multimedia')
| -rw-r--r-- | multimedia/ffmpeg3/Makefile | 8 | ||||
| -rw-r--r-- | multimedia/ffmpeg3/distinfo | 4 | ||||
| -rw-r--r-- | multimedia/ffmpeg3/patches/patch-configure | 12 |
3 files changed, 11 insertions, 13 deletions
diff --git a/multimedia/ffmpeg3/Makefile b/multimedia/ffmpeg3/Makefile index 83250f0380a..5edceb43f95 100644 --- a/multimedia/ffmpeg3/Makefile +++ b/multimedia/ffmpeg3/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.55 2020/06/26 03:11:40 jklos Exp $ +# $NetBSD: Makefile,v 1.56 2020/06/26 21:19:16 nia Exp $ PKGNAME= ${DISTNAME:S/ffmpeg/ffmpeg3/} -PKGREVISION= 8 +PKGREVISION= 9 MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= https://ffmpeg.org/ COMMENT= Decoding, encoding and streaming software (v3.x) @@ -56,10 +56,6 @@ CFLAGS+= -mstackrealign -mpreferred-stack-boundary=4 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} diff --git a/multimedia/ffmpeg3/distinfo b/multimedia/ffmpeg3/distinfo index 1361d8d6e45..a50192ebc91 100644 --- a/multimedia/ffmpeg3/distinfo +++ b/multimedia/ffmpeg3/distinfo @@ -1,11 +1,11 @@ -$NetBSD: distinfo,v 1.32 2020/01/08 13:41:33 wiz Exp $ +$NetBSD: distinfo,v 1.33 2020/06/26 21:19:16 nia Exp $ SHA1 (ffmpeg-3.4.7.tar.xz) = b9c4b52cda84b0d23c9a542beaf32a68b204c287 RMD160 (ffmpeg-3.4.7.tar.xz) = 7dfd08aac3295785034047bd73967a18ce4b8d79 SHA512 (ffmpeg-3.4.7.tar.xz) = a069618e25753b2c796c4221b5ff9251fea436b11890098166273f456eb7b7832d61f1e7976bd2117f1d55450975a94403be930bb0fa27d7a98cd7c61f80b0d2 Size (ffmpeg-3.4.7.tar.xz) = 8497552 bytes SHA1 (patch-Makefile) = 0c35f53878b0420aeea49d8ccb249279e705eb40 -SHA1 (patch-configure) = a30c25267dec3642a010d7cb66fc98e8c5c0bdea +SHA1 (patch-configure) = 48245369d03cb41576ab18abb4e93cfc5c2c5267 SHA1 (patch-doc_Makefile) = 50ee7aaf74f8a5c439b11f141b5408322659543a SHA1 (patch-libavformat_sctp.c) = 22bad9c7dc152aec3c60e0009899af241f495535 SHA1 (patch-libavutil_common.h) = d0f1093bc82567807b39dde990ee347f90a082c9 diff --git a/multimedia/ffmpeg3/patches/patch-configure b/multimedia/ffmpeg3/patches/patch-configure index 0b1c67d6476..4a74c0b8d78 100644 --- a/multimedia/ffmpeg3/patches/patch-configure +++ b/multimedia/ffmpeg3/patches/patch-configure @@ -1,18 +1,20 @@ -$NetBSD: patch-configure,v 1.6 2018/05/27 15:24:32 tsutsui Exp $ +$NetBSD: patch-configure,v 1.7 2020/06/26 21:19:16 nia Exp $ -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. ---- configure.orig 2018-02-12 00:29:18.000000000 +0000 +--- configure.orig 2019-12-01 22:46:41.000000000 +0000 +++ configure -@@ -4940,6 +4940,7 @@ case $target_os in +@@ -4941,6 +4941,8 @@ case $target_os in ;; netbsd) disable symver + enable pic ++ enable section_data_rel_ro oss_indev_extralibs="-lossaudio" oss_outdev_extralibs="-lossaudio" enabled gcc || check_ldflags -Wl,-zmuldefs -@@ -5360,10 +5361,13 @@ check_cc <<EOF && enable attribute_may_a +@@ -5361,10 +5363,13 @@ check_cc <<EOF && enable attribute_may_a union { int x; } __attribute__((may_alias)) x; EOF |