Pullup ticket #3604 - requested by drochner

multimedia/ffmpeg security update

Revisions pulled up:
- multimedia/ffmpeg/Makefile                                    1.73-1.74
- multimedia/ffmpeg/Makefile.common                             1.13-1.14
- multimedia/ffmpeg/distinfo                                    1.45-1.46
- multimedia/ffmpeg/patches/patch-configure                     1.14

---
   Module Name:    pkgsrc
   Committed By:   drochner
   Date:           Fri Oct  7 12:20:39 UTC 2011

   Modified Files:
           pkgsrc/multimedia/ffmpeg: Makefile Makefile.common distinfo

   Log Message:
   update to 0.7.6
   changes:
   -security fixes to many demuxers and decoders
   -bugfixes

---
   Module Name:    pkgsrc
   Committed By:   drochner
   Date:           Mon Nov  7 10:43:35 UTC 2011

   Modified Files:
           pkgsrc/multimedia/ffmpeg: Makefile.common distinfo
           pkgsrc/multimedia/ffmpeg/patches: patch-configure

   Log Message:
   update to 0.7.7
   "fixes around 90 bugs, several of which are security relevant"
   (sorry, no details in the release notes)

---
   Module Name:    pkgsrc
   Committed By:   drochner
   Date:           Mon Nov  7 10:45:36 UTC 2011

   Modified Files:
           pkgsrc/multimedia/ffmpeg: Makefile

   Log Message:
   update for new release date

4 files changed, 18 insertions, 27 deletions

diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile
index 5a0446c1283..5e3535481f1 100644
--- a/multimedia/ffmpeg/Makefile
+++ b/multimedia/ffmpeg/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.72 2011/09/12 17:18:52 drochner Exp $
+# $NetBSD: Makefile,v 1.72.2.1 2011/11/16 21:07:03 sbd Exp $
 
-# XXX This is release 0.7.4 but we had date-based pkgnames before.
-PKGNAME=	ffmpeg-20110907.${DISTVERSION}
+# XXX This is release 0.7.7 but we had date-based pkgnames before.
+PKGNAME=	ffmpeg-20111104.${DISTVERSION}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://ffmpeg.mplayerhq.hu/
diff --git a/multimedia/ffmpeg/Makefile.common b/multimedia/ffmpeg/Makefile.common
index 52458c1784f..8b2aa50c2ab 100644
--- a/multimedia/ffmpeg/Makefile.common
+++ b/multimedia/ffmpeg/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.12 2011/09/12 17:18:52 drochner Exp $
+# $NetBSD: Makefile.common,v 1.12.2.1 2011/11/16 21:07:03 sbd Exp $
 # used by multimedia/ffplay/Makefile
 # used by multimedia/ffmpeg/Makefile
 
@@ -9,7 +9,7 @@ MASTER_SITES=	http://www.ffmpeg.org/releases/ \
 		http://irkmaffia.com/~ahoka/distfiles/
 EXTRACT_SUFX=	.tar.bz2
 
-DISTVERSION=	0.7.4
+DISTVERSION=	0.7.7
 PREV_PKGPATH=	multimedia/ffmpeg-devel
 PATCHDIR=	${.CURDIR}/../../multimedia/ffmpeg/patches
 
diff --git a/multimedia/ffmpeg/distinfo b/multimedia/ffmpeg/distinfo
index 701848d43b3..345664e7afe 100644
--- a/multimedia/ffmpeg/distinfo
+++ b/multimedia/ffmpeg/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.44 2011/09/14 17:21:08 hans Exp $
+$NetBSD: distinfo,v 1.44.2.1 2011/11/16 21:07:03 sbd Exp $
 
-SHA1 (ffmpeg-0.7.4.tar.bz2) = f528ef9eaa224acd970710d6a408f2ff03b39544
-RMD160 (ffmpeg-0.7.4.tar.bz2) = df886310ae02b851c02be531a67b5c140970af96
-Size (ffmpeg-0.7.4.tar.bz2) = 4523220 bytes
+SHA1 (ffmpeg-0.7.7.tar.bz2) = 30cc01d359d99bb6304b7fecbd5ff909843d93f4
+RMD160 (ffmpeg-0.7.7.tar.bz2) = 1123b0e38811dfd4f4f1cb0f7678518f90849034
+Size (ffmpeg-0.7.7.tar.bz2) = 4531586 bytes
 SHA1 (patch-aa) = c9540d0ca0a671e9faa8b5b7847c103b515ac382
 SHA1 (patch-ac) = 4eba6e68d3fab082a957fa08f5618561f3b4aecb
 SHA1 (patch-ad) = d3e06c855ab1a5ff3ddb0bee108ea88166c32cb6
-SHA1 (patch-configure) = 89e56f8cd662c078380b1a700f84639bc423c807
+SHA1 (patch-configure) = 355743ab745fb4c47ff6c5ca403573660ec7ecb6
diff --git a/multimedia/ffmpeg/patches/patch-configure b/multimedia/ffmpeg/patches/patch-configure
index 8d15db80354..3217b94cdbb 100644
--- a/multimedia/ffmpeg/patches/patch-configure
+++ b/multimedia/ffmpeg/patches/patch-configure
@@ -1,8 +1,8 @@
-$NetBSD: patch-configure,v 1.13 2011/09/14 17:21:08 hans Exp $
+$NetBSD: patch-configure,v 1.13.2.1 2011/11/16 21:07:03 sbd Exp $
 
---- configure.orig	2011-06-21 21:29:25.000000000 +0200
-+++ configure	2011-09-12 17:35:52.888456457 +0200
-@@ -2404,6 +2404,10 @@ case $target_os in
+--- configure.orig	2011-11-04 21:30:00.000000000 +0000
++++ configure
+@@ -2412,6 +2412,10 @@ case $target_os in
          ;;
      netbsd)
          disable symver
@@ -13,7 +13,7 @@ $NetBSD: patch-configure,v 1.13 2011/09/14 17:21:08 hans Exp $
          oss_indev_extralibs="-lossaudio"
          oss_outdev_extralibs="-lossaudio"
          ;;
-@@ -2627,10 +2631,13 @@ check_cc <<EOF && enable attribute_may_a
+@@ -2637,10 +2641,13 @@ check_cc <<EOF && enable attribute_may_a
  union { int x; } __attribute__((may_alias)) x;
  EOF
  
@@ -30,7 +30,7 @@ $NetBSD: patch-configure,v 1.13 2011/09/14 17:21:08 hans Exp $
  
  if enabled alpha; then
  
-@@ -2963,7 +2970,7 @@ else
+@@ -2974,7 +2981,7 @@ else
  fi
  enabled sdl && add_cflags $sdl_cflags && add_extralibs $sdl_libs
  
@@ -39,7 +39,7 @@ $NetBSD: patch-configure,v 1.13 2011/09/14 17:21:08 hans Exp $
  
  check_header linux/fb.h
  check_header linux/videodev.h
-@@ -3049,6 +3056,7 @@ check_ldflags -Wl,--warn-common
+@@ -3060,6 +3067,7 @@ check_ldflags -Wl,--warn-common
  check_ldflags -Wl,-rpath-link,libpostproc -Wl,-rpath-link,libswscale -Wl,-rpath-link,libavfilter -Wl,-rpath-link,libavdevice -Wl,-rpath-link,libavformat -Wl,-rpath-link,libavcodec -Wl,-rpath-link,libavutil
  test_ldflags -Wl,-Bsymbolic && append SHFLAGS -Wl,-Bsymbolic
  
@@ -47,7 +47,7 @@ $NetBSD: patch-configure,v 1.13 2011/09/14 17:21:08 hans Exp $
  echo "X{};" > $TMPV
  if test_ldflags -Wl,--version-script,$TMPV; then
      append SHFLAGS '-Wl,--version-script,\$(SUBDIR)lib\$(NAME).ver'
-@@ -3061,6 +3069,7 @@ __asm__(".symver ff_foo,av_foo@VERSION")
+@@ -3072,6 +3080,7 @@ __asm__(".symver ff_foo,av_foo@VERSION")
  void ff_foo(void) {}
  EOF
  fi
@@ -55,12 +55,3 @@ $NetBSD: patch-configure,v 1.13 2011/09/14 17:21:08 hans Exp $
  
  if enabled small; then
      add_cflags $size_cflags
-@@ -3148,7 +3157,7 @@ check_deps $CONFIG_LIST       \
- 
- enabled asm || { arch=c; disable $ARCH_LIST $ARCH_EXT_LIST; }
- 
--if test $target_os == "haiku"; then
-+if test $target_os = "haiku"; then
-     disable memalign
-     disable posix_memalign
- fi