Sync patches

[coypu <coypu%sdf.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	coypu <coypu%sdf.org@localhost>
Pushed By:	coypu
Date:		Mon Aug 15 11:42:23 2016 +0300
Changeset:	09628556fa34aa44a8368e8cc558ac8691f2883c

Modified Files:
	ffmpeg-current/distinfo
	ffmpeg-current/patches/patch-aa
	ffmpeg-current/patches/patch-configure

Log Message:
Sync patches

Removing one disabled test as upstream made it
depend on another test, and it might suffice.

their commit message was:
"Only enable symbol reduction if the compiler does proper DCE"

previously we unconditionally disabled it.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=09628556fa34aa44a8368e8cc558ac8691f2883c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 ffmpeg-current/distinfo                |  4 ++--
 ffmpeg-current/patches/patch-aa        | 10 +++++-----
 ffmpeg-current/patches/patch-configure | 35 +++++-----------------------------
 3 files changed, 12 insertions(+), 37 deletions(-)

diffs:
diff --git a/ffmpeg-current/distinfo b/ffmpeg-current/distinfo
index ed19b3d..beba278 100644
--- a/ffmpeg-current/distinfo
+++ b/ffmpeg-current/distinfo
@@ -3,7 +3,7 @@ $NetBSD: distinfo,v 1.1 2013/05/04 10:39:12 shattered Exp $
 SHA1 (ffmpeg-1.2.tar.bz2) = e1df2389560da95e1a76f9375f054e630c7e2602
 RMD160 (ffmpeg-1.2.tar.bz2) = f1b1122ee39276cf5eb00b4113794a2c23c1e66f
 Size (ffmpeg-1.2.tar.bz2) = 5969590 bytes
-SHA1 (patch-aa) = 14006874aee07e7e41803269040f0ae0157d931d
+SHA1 (patch-aa) = 6594f212df313f56db325faf52b4c48be395ea3a
 SHA1 (patch-ac) = ff8a7a5fdfd4987ef2835bd7360a78efd4310253
 SHA1 (patch-ap) = ebbd0c169f228af37ae2dd54b27d5dba11a34c5e
-SHA1 (patch-configure) = 2a1085bef529b883270a4d55450c202f83c478db
+SHA1 (patch-configure) = b7e9915c07d05cee697323ce85ca2b72e8528f42
diff --git a/ffmpeg-current/patches/patch-aa b/ffmpeg-current/patches/patch-aa
index 5010cf2..ca5ffe2 100644
--- a/ffmpeg-current/patches/patch-aa
+++ b/ffmpeg-current/patches/patch-aa
@@ -1,8 +1,8 @@
 $NetBSD: patch-aa,v 1.1 2013/05/04 10:39:12 shattered Exp $
 
---- libavutil/x86/cpu.c.orig	2013-01-06 21:53:29.000000000 +0000
+--- libavutil/x86/cpu.c.orig	2016-08-15 08:09:26.108776359 +0000
 +++ libavutil/x86/cpu.c
-@@ -115,6 +115,7 @@ int ff_get_cpu_flags_x86(void)
+@@ -116,6 +116,7 @@ int ff_get_cpu_flags_x86(void)
  #if HAVE_SSE
          if (std_caps & (1 << 25))
              rval |= AV_CPU_FLAG_SSE;
@@ -10,11 +10,11 @@ $NetBSD: patch-aa,v 1.1 2013/05/04 10:39:12 shattered Exp $
          if (std_caps & (1 << 26))
              rval |= AV_CPU_FLAG_SSE2;
          if (ecx & 1)
-@@ -134,6 +135,7 @@ int ff_get_cpu_flags_x86(void)
-                 rval |= AV_CPU_FLAG_AVX;
+@@ -140,6 +141,7 @@ int ff_get_cpu_flags_x86(void)
+             }
          }
  #endif /* HAVE_AVX */
 +#endif /* gcc >= 4.2 */
  #endif /* HAVE_SSE */
      }
- 
+     if (max_std_level >= 7) {
diff --git a/ffmpeg-current/patches/patch-configure b/ffmpeg-current/patches/patch-configure
index 676c4f2..698e3f9 100644
--- a/ffmpeg-current/patches/patch-configure
+++ b/ffmpeg-current/patches/patch-configure
@@ -1,8 +1,8 @@
 $NetBSD: patch-configure,v 1.1 2013/05/04 10:39:12 shattered Exp $
 
---- configure.orig	2013-01-06 21:53:29.000000000 +0000
+--- configure.orig	2016-08-15 08:09:25.492305991 +0000
 +++ configure
-@@ -3134,6 +3134,11 @@ case $target_os in
+@@ -4648,6 +4648,11 @@ case $target_os in
          ;;
      netbsd)
          disable symver
@@ -14,7 +14,7 @@ $NetBSD: patch-configure,v 1.1 2013/05/04 10:39:12 shattered Exp $
          oss_indev_extralibs="-lossaudio"
          oss_outdev_extralibs="-lossaudio"
          enabled gcc || check_ldflags -Wl,-zmuldefs
-@@ -3469,10 +3474,13 @@ check_cc <<EOF && enable attribute_may_a
+@@ -5106,10 +5111,13 @@ check_cc <<EOF && enable attribute_may_a
  union { int x; } __attribute__((may_alias)) x;
  EOF
  
@@ -29,30 +29,5 @@ $NetBSD: patch-configure,v 1.1 2013/05/04 10:39:12 shattered Exp $
  EOF
 -od -t x1 $TMPO | grep -q '42 *49 *47 *45' && enable bigendian
  
- if enabled alpha; then
- 
-@@ -4010,6 +4018,7 @@ enabled xmm_clobber_test &&
-                   -Wl,--wrap,sws_scale ||
-     disable xmm_clobber_test
- 
-+if false; then
- echo "X{};" > $TMPV
- if test_ldflags -Wl,--version-script,$TMPV; then
-     append SHFLAGS '-Wl,--version-script,\$(SUBDIR)lib\$(NAME).ver'
-@@ -4022,6 +4031,7 @@ __asm__(".symver ff_foo,av_foo@VERSION")
- void ff_foo(void) {}
- EOF
- fi
-+fi
- 
- if [ -z "$optflags" ]; then
-     if enabled small; then
-@@ -4517,7 +4527,7 @@ Version: $version
- Requires: $(enabled shared || echo $requires)
- Requires.private: $(enabled shared && echo $requires)
- Conflicts:
--Libs: -L\${libdir} -l${shortname} $(enabled shared || echo $libs)
-+Libs: -L\${libdir} -Wl,-R\${libdir} -l${shortname} $(enabled shared || echo $libs)
- Libs.private: $(enabled shared && echo $libs)
- Cflags: -I\${includedir}
- EOF
+ if ! enabled ppc64 || enabled bigendian; then
+     disable vsx