CVS commit: pkgsrc/multimedia/ffmpeg3

["Izumi Tsutsui" <tsutsui%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tsutsui
Date:           Sun May 27 15:24:32 UTC 2018

Modified Files:
        pkgsrc/multimedia/ffmpeg3: Makefile distinfo
        pkgsrc/multimedia/ffmpeg3/patches: patch-configure

Log Message:
ffmpeg3: avoid text relocations on NetBSD/i386.

* explicitly specify --disable-asm on NetBSD/i386
* explicitly enable pic even for NetBSD/i386 as other architecture

Bump PKGREVISION.  Ok'ed by wiz@ in PR pkg/53319.


To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 pkgsrc/multimedia/ffmpeg3/Makefile
cvs rdiff -u -r1.26 -r1.27 pkgsrc/multimedia/ffmpeg3/distinfo
cvs rdiff -u -r1.5 -r1.6 pkgsrc/multimedia/ffmpeg3/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/ffmpeg3/Makefile
diff -u pkgsrc/multimedia/ffmpeg3/Makefile:1.32 pkgsrc/multimedia/ffmpeg3/Makefile:1.33
--- pkgsrc/multimedia/ffmpeg3/Makefile:1.32     Tue Apr 17 22:29:44 2018
+++ pkgsrc/multimedia/ffmpeg3/Makefile  Sun May 27 15:24:32 2018
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.32 2018/04/17 22:29:44 wiz Exp $
+# $NetBSD: Makefile,v 1.33 2018/05/27 15:24:32 tsutsui Exp $
 
 PKGNAME=       ${DISTNAME:S/ffmpeg/ffmpeg3/}
-PKGREVISION=   5
+PKGREVISION=   6
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://ffmpeg.mplayerhq.hu/
 COMMENT=       Decoding, encoding and streaming software (v3.x)
@@ -41,10 +41,11 @@ post-install:
 
 .include "../../mk/compiler.mk"
 
-# disable asm on i386 for non-gcc and gcc < 4.2
+# disable asm on i386 for non-gcc and gcc < 4.2, or to avoid text relocations
 .if ${MACHINE_ARCH} == "i386"
 .  if !empty(MACHINE_PLATFORM:MDarwin-*-i386) \
    || !empty(MACHINE_PLATFORM:MSunOS-*-i386) \
+   || !empty(MACHINE_PLATFORM:MNetBSD-*-i386) \
    || !empty(CC_VERSION:Mgcc-[123]*) \
    || !empty(CC_VERSION:Mgcc-4.[01].*) \
    || empty(CC_VERSION:Mgcc*)

Index: pkgsrc/multimedia/ffmpeg3/distinfo
diff -u pkgsrc/multimedia/ffmpeg3/distinfo:1.26 pkgsrc/multimedia/ffmpeg3/distinfo:1.27
--- pkgsrc/multimedia/ffmpeg3/distinfo:1.26     Mon Feb 26 07:40:28 2018
+++ pkgsrc/multimedia/ffmpeg3/distinfo  Sun May 27 15:24:32 2018
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.26 2018/02/26 07:40:28 adam Exp $
+$NetBSD: distinfo,v 1.27 2018/05/27 15:24:32 tsutsui Exp $
 
 SHA1 (ffmpeg-3.4.2.tar.xz) = baef74d93683c6b2029ac36b900732795216e066
 RMD160 (ffmpeg-3.4.2.tar.xz) = 97751ae03808242ced7cc9495f999a3b1760325c
 SHA512 (ffmpeg-3.4.2.tar.xz) = 9fb6df5ddde8af51b929180192d29210695deeef61211fb8a69206bdeabba729cd47e346e4dcf6f27c3416ed77383d30b51933e75fc515466404f85d105bb301
 Size (ffmpeg-3.4.2.tar.xz) = 8478376 bytes
 SHA1 (patch-Makefile) = 0c35f53878b0420aeea49d8ccb249279e705eb40
-SHA1 (patch-configure) = ed50009ff973844427af7b5720af6493ebfce298
+SHA1 (patch-configure) = a30c25267dec3642a010d7cb66fc98e8c5c0bdea
 SHA1 (patch-doc_Makefile) = 50ee7aaf74f8a5c439b11f141b5408322659543a
 SHA1 (patch-libavformat_sctp.c) = 22bad9c7dc152aec3c60e0009899af241f495535
 SHA1 (patch-libavutil_common.h) = d0f1093bc82567807b39dde990ee347f90a082c9

Index: pkgsrc/multimedia/ffmpeg3/patches/patch-configure
diff -u pkgsrc/multimedia/ffmpeg3/patches/patch-configure:1.5 pkgsrc/multimedia/ffmpeg3/patches/patch-configure:1.6
--- pkgsrc/multimedia/ffmpeg3/patches/patch-configure:1.5       Wed Oct 18 20:25:41 2017
+++ pkgsrc/multimedia/ffmpeg3/patches/patch-configure   Sun May 27 15:24:32 2018
@@ -1,22 +1,18 @@
-$NetBSD: patch-configure,v 1.5 2017/10/18 20:25:41 adam Exp $
+$NetBSD: patch-configure,v 1.6 2018/05/27 15:24:32 tsutsui Exp $
 
-Enable PIC on non-i386 NetBSD.
+Enable PIC on NetBSD, even on i386 to avoid text relocations.
 
---- configure.orig     2017-10-15 15:59:36.000000000 +0000
+--- configure.orig     2018-02-12 00:29:18.000000000 +0000
 +++ configure
-@@ -4939,6 +4939,11 @@ case $target_os in
+@@ -4940,6 +4940,7 @@ case $target_os in
          ;;
      netbsd)
          disable symver
-+        # NetBSD/macppc *really* needs PIC enabled.  ffmpeg has repeatedly
-+        # broken time and time again because PIC support has been removed
-+        # from architectures that need it.  So, if you touch this, please
-+        # be careful and make sure that your changes work.
-+        test "${subarch}" != "x86_32" && enable pic
++        enable pic
          oss_indev_extralibs="-lossaudio"
          oss_outdev_extralibs="-lossaudio"
          enabled gcc || check_ldflags -Wl,-zmuldefs
-@@ -5359,10 +5364,13 @@ check_cc <<EOF && enable attribute_may_a
+@@ -5360,10 +5361,13 @@ check_cc <<EOF && enable attribute_may_a
  union { int x; } __attribute__((may_alias)) x;
  EOF