CVS commit: pkgsrc/multimedia/ffmpeg3

["Maya Rashish" <maya%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   maya
Date:           Wed Aug  3 12:06:15 UTC 2016

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

Log Message:
All sun4* machines are sparcs, not just sun4u.
(64bit check is separate)

Allow building for Solaris/sun4v.

from Joerg Clausen in pkg/51337


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/multimedia/ffmpeg3/distinfo
cvs rdiff -u -r1.1 -r1.2 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/distinfo
diff -u pkgsrc/multimedia/ffmpeg3/distinfo:1.5 pkgsrc/multimedia/ffmpeg3/distinfo:1.6
--- pkgsrc/multimedia/ffmpeg3/distinfo:1.5      Sat Jul  2 12:30:16 2016
+++ pkgsrc/multimedia/ffmpeg3/distinfo  Wed Aug  3 12:06:15 2016
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.5 2016/07/02 12:30:16 ryoon Exp $
+$NetBSD: distinfo,v 1.6 2016/08/03 12:06:15 maya Exp $
 
 SHA1 (ffmpeg-3.1.1.tar.bz2) = 542e24c3a50a0ba7d3fb4fc3432459c63e2195ee
 RMD160 (ffmpeg-3.1.1.tar.bz2) = 1b2b8e480d7140e43ff6f61ac4b05f2234b5681a
 SHA512 (ffmpeg-3.1.1.tar.bz2) = b5b4b2d518affa708b05f72201d5ac20446c88b5fb4dd8586cdc29d1132c678be94898e4f5ad27bef4ac987557305838133f45e94ff55d65f22a76f4f312888a
 Size (ffmpeg-3.1.1.tar.bz2) = 9327512 bytes
 SHA1 (patch-Makefile) = e3cb5cedccd2840f36ab90cd2f4b7987e1098a56
-SHA1 (patch-configure) = e57e2501e63a05e9eeefc688e311a16729d1a711
+SHA1 (patch-configure) = b881b648812f96cfd772e6a5de69db98adc08303
 SHA1 (patch-doc_Makefile) = 50ee7aaf74f8a5c439b11f141b5408322659543a
 SHA1 (patch-libavutil_common.h) = de36efed3a8a2069e170e5afe77eb122a46d14b2
 SHA1 (patch-libavutil_opencl.c) = 3366c6c2aa7daaf097298214d2fff7c60c645ca4

Index: pkgsrc/multimedia/ffmpeg3/patches/patch-configure
diff -u pkgsrc/multimedia/ffmpeg3/patches/patch-configure:1.1 pkgsrc/multimedia/ffmpeg3/patches/patch-configure:1.2
--- pkgsrc/multimedia/ffmpeg3/patches/patch-configure:1.1       Sat Mar  5 08:52:23 2016
+++ pkgsrc/multimedia/ffmpeg3/patches/patch-configure   Wed Aug  3 12:06:15 2016
@@ -1,8 +1,17 @@
-$NetBSD: patch-configure,v 1.1 2016/03/05 08:52:23 ryoon Exp $
+$NetBSD: patch-configure,v 1.2 2016/08/03 12:06:15 maya Exp $
 
---- configure.orig     2016-02-15 02:29:37.000000000 +0000
+--- configure.orig     2016-06-26 23:54:28.000000000 +0000
 +++ configure
-@@ -4490,6 +4490,11 @@ case $target_os in
+@@ -4201,7 +4201,7 @@ case "$arch" in
+     sh4|sh)
+         arch="sh4"
+     ;;
+-    sun4u|sparc*)
++    sun4*|sparc*)
+         arch="sparc"
+     ;;
+     tilegx|tile-gx)
+@@ -4631,6 +4631,11 @@ case $target_os in
          ;;
      netbsd)
          disable symver
@@ -14,7 +23,7 @@ $NetBSD: patch-configure,v 1.1 2016/03/0
          oss_indev_extralibs="-lossaudio"
          oss_outdev_extralibs="-lossaudio"
          enabled gcc || check_ldflags -Wl,-zmuldefs
-@@ -4943,10 +4948,13 @@ check_cc <<EOF && enable attribute_may_a
+@@ -5089,10 +5094,13 @@ check_cc <<EOF && enable attribute_may_a
  union { int x; } __attribute__((may_alias)) x;
  EOF
  
@@ -31,7 +40,7 @@ $NetBSD: patch-configure,v 1.1 2016/03/0
  
  if ! enabled ppc64 || enabled bigendian; then
      disable vsx
-@@ -5851,6 +5859,7 @@ enabled xmm_clobber_test &&
+@@ -6041,6 +6049,7 @@ enabled xmm_clobber_test &&
                    -Wl,--wrap,sws_scale ||
      disable xmm_clobber_test
  
@@ -39,7 +48,7 @@ $NetBSD: patch-configure,v 1.1 2016/03/0
  echo "X { local: *; };" > $TMPV
  if test_ldflags -Wl,--version-script,$TMPV; then
      append SHFLAGS '-Wl,--version-script,\$(SUBDIR)lib\$(NAME).ver'
-@@ -5866,6 +5875,7 @@ EOF
+@@ -6056,6 +6065,7 @@ EOF
  __asm__(".symver ff_foo,av_foo@VERSION");
  void ff_foo(void) {}
  EOF
@@ -47,7 +56,7 @@ $NetBSD: patch-configure,v 1.1 2016/03/0
  
  if [ -z "$optflags" ]; then
      if enabled small; then
-@@ -6512,7 +6522,7 @@ Version: $version
+@@ -6729,7 +6739,7 @@ Version: $version
  Requires: $(enabled shared || echo $requires)
  Requires.private: $(enabled shared && echo $requires)
  Conflicts: