CVS commit: pkgsrc/multimedia/ffmpeg1

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

Module Name:    pkgsrc
Committed By:   maya
Date:           Wed Aug  3 12:07:17 UTC 2016

Modified Files:
        pkgsrc/multimedia/ffmpeg1: distinfo
        pkgsrc/multimedia/ffmpeg1/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.9 -r1.10 pkgsrc/multimedia/ffmpeg1/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/multimedia/ffmpeg1/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/ffmpeg1/distinfo
diff -u pkgsrc/multimedia/ffmpeg1/distinfo:1.9 pkgsrc/multimedia/ffmpeg1/distinfo:1.10
--- pkgsrc/multimedia/ffmpeg1/distinfo:1.9      Fri Nov 20 18:36:12 2015
+++ pkgsrc/multimedia/ffmpeg1/distinfo  Wed Aug  3 12:07:17 2016
@@ -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 b
 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

Index: pkgsrc/multimedia/ffmpeg1/patches/patch-configure
diff -u pkgsrc/multimedia/ffmpeg1/patches/patch-configure:1.1 pkgsrc/multimedia/ffmpeg1/patches/patch-configure:1.2
--- pkgsrc/multimedia/ffmpeg1/patches/patch-configure:1.1       Mon Aug 11 23:01:50 2014
+++ pkgsrc/multimedia/ffmpeg1/patches/patch-configure   Wed Aug  3 12:07:17 2016
@@ -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/1
          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/1
  
  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/1
  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/1
  
  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: