All sun4* machines are sparcs, not just sun4u.

(64bit check is separate)

Allow building for Solaris/sun4v.

from Joerg Clausen in pkg/51337

6 files changed, 49 insertions, 22 deletions

diff --git a/multimedia/ffmpeg1/distinfo b/multimedia/ffmpeg1/distinfo
index 20368adc27d..8fad35378ed 100644
--- a/multimedia/ffmpeg1/distinfo
+++ b/multimedia/ffmpeg1/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.9 2015/11/20 18:36:12 ryoon Exp $
+$NetBSD: distinfo,v 1.10 2016/08/03 12:07:17 maya Exp $
 
 SHA1 (ffmpeg-1.2.12.tar.bz2) = ae7328442046f2c92e7909e66e91034e8072c78b
 RMD160 (ffmpeg-1.2.12.tar.bz2) = 38fd1f46a516310e80a7ea22ae09ef6968864d6f
@@ -7,6 +7,6 @@ Size (ffmpeg-1.2.12.tar.bz2) = 5974419 bytes
 SHA1 (patch-aa) = 14006874aee07e7e41803269040f0ae0157d931d
 SHA1 (patch-ac) = ff8a7a5fdfd4987ef2835bd7360a78efd4310253
 SHA1 (patch-ap) = ebbd0c169f228af37ae2dd54b27d5dba11a34c5e
-SHA1 (patch-configure) = a04493172f7600cc9ebbda6c140915b1169f5f14
+SHA1 (patch-configure) = d6de56c67c01ada790c5cccdd592e311c14269f1
 SHA1 (patch-libavcodec_libvpxenc.c) = e6a0b2cde16952ee0e00521898ae85119b7dcb66
 SHA1 (patch-libavcodec_x86_ac3dsp_init.c) = 603eb10a316edf48e50f64f048772ad4b97cac5a
diff --git a/multimedia/ffmpeg1/patches/patch-configure b/multimedia/ffmpeg1/patches/patch-configure
index 45612a1e242..4c51edd7d18 100644
--- a/multimedia/ffmpeg1/patches/patch-configure
+++ b/multimedia/ffmpeg1/patches/patch-configure
@@ -1,8 +1,17 @@
-$NetBSD: patch-configure,v 1.1 2014/08/11 23:01:50 wiz Exp $
+$NetBSD: patch-configure,v 1.2 2016/08/03 12:07:17 maya Exp $
 
---- configure.orig	2013-07-27 23:49:20.000000000 +0000
+--- configure.orig	2015-02-12 14:38:15.000000000 +0000
 +++ configure
-@@ -3225,6 +3225,11 @@ case $target_os in
+@@ -2922,7 +2922,7 @@ case "$arch" in
+     sh4|sh)
+         arch="sh4"
+     ;;
+-    sun4u|sparc*)
++    sun4*|sparc*)
+         arch="sparc"
+     ;;
+     tilegx|tile-gx)
+@@ -3247,6 +3247,11 @@ case $target_os in
          ;;
      netbsd)
          disable symver
@@ -14,7 +23,7 @@ $NetBSD: patch-configure,v 1.1 2014/08/11 23:01:50 wiz Exp $
          oss_indev_extralibs="-lossaudio"
          oss_outdev_extralibs="-lossaudio"
          enabled gcc || check_ldflags -Wl,-zmuldefs
-@@ -3555,10 +3560,13 @@ check_cc <<EOF && enable attribute_may_a
+@@ -3577,10 +3582,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 2014/08/11 23:01:50 wiz Exp $
  
  if enabled alpha; then
  
-@@ -4092,6 +4100,7 @@ enabled xmm_clobber_test &&
+@@ -4115,6 +4123,7 @@ enabled xmm_clobber_test &&
                    -Wl,--wrap,sws_scale ||
      disable xmm_clobber_test
  
@@ -39,7 +48,7 @@ $NetBSD: patch-configure,v 1.1 2014/08/11 23:01:50 wiz Exp $
  echo "X{};" > $TMPV
  if test_ldflags -Wl,--version-script,$TMPV; then
      append SHFLAGS '-Wl,--version-script,\$(SUBDIR)lib\$(NAME).ver'
-@@ -4104,6 +4113,7 @@ __asm__(".symver ff_foo,av_foo@VERSION")
+@@ -4127,6 +4136,7 @@ __asm__(".symver ff_foo,av_foo@VERSION")
  void ff_foo(void) {}
  EOF
  fi
@@ -47,7 +56,7 @@ $NetBSD: patch-configure,v 1.1 2014/08/11 23:01:50 wiz Exp $
  
  if [ -z "$optflags" ]; then
      if enabled small; then
-@@ -4560,7 +4570,7 @@ Version: $version
+@@ -4583,7 +4593,7 @@ Version: $version
  Requires: $(enabled shared || echo $requires)
  Requires.private: $(enabled shared && echo $requires)
  Conflicts:
diff --git a/multimedia/ffmpeg2/distinfo b/multimedia/ffmpeg2/distinfo
index bc96fc2be8b..8a6379bf938 100644
--- a/multimedia/ffmpeg2/distinfo
+++ b/multimedia/ffmpeg2/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.48 2016/04/29 19:18:36 adam Exp $
+$NetBSD: distinfo,v 1.49 2016/08/03 12:06:47 maya Exp $
 
 SHA1 (ffmpeg-2.8.7.tar.xz) = 8c0fb21703cf77442338a26f2f645eda68bde6b2
 RMD160 (ffmpeg-2.8.7.tar.xz) = ed757d4ed2763af3260ad13937f072831058d52d
 SHA512 (ffmpeg-2.8.7.tar.xz) = 1ab6ec0df9aa63f3360863267bbbd39a63ffa004183dfd04a4efc6bf748796eae42de599102d523c08b9a15cf72ed9534b4793cd0468d112c17d95ab7bd447cb
 Size (ffmpeg-2.8.7.tar.xz) = 7205628 bytes
 SHA1 (patch-Makefile) = e3cb5cedccd2840f36ab90cd2f4b7987e1098a56
-SHA1 (patch-configure) = c739d4f002b0ed1850f88b5a961672b5e93f1dc1
+SHA1 (patch-configure) = 330e73d68491b7b27b88df9055a7bdbb913b37e3
 SHA1 (patch-doc_Makefile) = 48d3b3ccd800303a73fcda79e78533228f79d750
 SHA1 (patch-libavcodec_x86_ac3dsp_init.c) = f997271f4f4604987591d7f17c571aaaa8a6188a
 SHA1 (patch-libavutil_common.h) = de36efed3a8a2069e170e5afe77eb122a46d14b2
diff --git a/multimedia/ffmpeg2/patches/patch-configure b/multimedia/ffmpeg2/patches/patch-configure
index 05dbb05a152..24d1279d716 100644
--- a/multimedia/ffmpeg2/patches/patch-configure
+++ b/multimedia/ffmpeg2/patches/patch-configure
@@ -1,7 +1,16 @@
-$NetBSD: patch-configure,v 1.9 2016/01/16 17:04:33 leot Exp $
+$NetBSD: patch-configure,v 1.10 2016/08/03 12:06:47 maya Exp $
 
---- configure.orig	2016-01-15 16:59:29.000000000 +0000
+--- configure.orig	2016-04-29 12:08:16.000000000 +0000
 +++ configure
+@@ -3867,7 +3867,7 @@ case "$arch" in
+     sh4|sh)
+         arch="sh4"
+     ;;
+-    sun4u|sparc*)
++    sun4*|sparc*)
+         arch="sparc"
+     ;;
+     tilegx|tile-gx)
 @@ -4300,6 +4300,11 @@ case $target_os in
          ;;
      netbsd)
diff --git a/multimedia/ffmpeg3/distinfo b/multimedia/ffmpeg3/distinfo
index 6f158c1bb9f..eda17a7abe8 100644
--- a/multimedia/ffmpeg3/distinfo
+++ b/multimedia/ffmpeg3/distinfo
@@ -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
diff --git a/multimedia/ffmpeg3/patches/patch-configure b/multimedia/ffmpeg3/patches/patch-configure
index f8d566ca61d..5c3d4399550 100644
--- a/multimedia/ffmpeg3/patches/patch-configure
+++ b/multimedia/ffmpeg3/patches/patch-configure
@@ -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/05 08:52:23 ryoon Exp $
          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/05 08:52:23 ryoon Exp $
  
  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/05 08:52:23 ryoon Exp $
  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/05 08:52:23 ryoon Exp $
  
  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: