From 30bca21acec2f70690bce73e7c205f7d78e71f39 Mon Sep 17 00:00:00 2001
From: Martin Matuska <mm@FreeBSD.org>
Date: Sun, 12 Dec 2010 23:43:50 +0000
Subject: [PATCH] - Remove -D_POSIX_C_SOURCE=200112 from CFLAGS     fixes some
 inline assembly crashes (libswscale.so)

Reported by:	avg (on freebsd-multimedia@)
---
 multimedia/ffmpeg-devel/Makefile              |  1 +
 multimedia/ffmpeg-devel/files/patch-configure | 20 ++++++++++++++++++-
 multimedia/ffmpeg/Makefile                    |  2 +-
 multimedia/ffmpeg/files/patch-configure       | 20 ++++++++++++++++++-
 4 files changed, 40 insertions(+), 3 deletions(-)

diff --git a/multimedia/ffmpeg-devel/Makefile b/multimedia/ffmpeg-devel/Makefile
index d16d1de488a9..45df333dfb75 100644
--- a/multimedia/ffmpeg-devel/Makefile
+++ b/multimedia/ffmpeg-devel/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ffmpeg
 DISTVERSION=	2010-11-30
+PORTREVISION=	1
 CATEGORIES=	multimedia audio ipv6 net
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	mm
diff --git a/multimedia/ffmpeg-devel/files/patch-configure b/multimedia/ffmpeg-devel/files/patch-configure
index 709c30424f5b..ff4ce0c621cf 100644
--- a/multimedia/ffmpeg-devel/files/patch-configure
+++ b/multimedia/ffmpeg-devel/files/patch-configure
@@ -1,5 +1,5 @@
 --- configure.orig	2010-11-04 11:38:39.000000000 +0100
-+++ configure	2010-11-30 13:49:43.509425851 +0100
++++ configure	2010-12-13 00:26:47.034162631 +0100
 @@ -1556,7 +1556,7 @@
  nm_opts='-g'
  
@@ -9,6 +9,24 @@
  cpu="generic"
  
  # OS
+@@ -1603,7 +1603,7 @@
+ 
+ CC_O='-o $@'
+ 
+-host_cflags='-D_ISOC99_SOURCE -D_POSIX_C_SOURCE=200112 -O3 -g -Wall'
++host_cflags='-D_ISOC99_SOURCE -O3 -g -Wall'
+ host_libs='-lm'
+ 
+ target_path='$(CURDIR)'
+@@ -2249,7 +2249,7 @@
+     die "C compiler test failed."
+ fi
+ 
+-add_cppflags -D_ISOC99_SOURCE -D_POSIX_C_SOURCE=200112
++add_cppflags -D_ISOC99_SOURCE
+ check_cflags -std=c99
+ check_cc -D_FILE_OFFSET_BITS=64 <<EOF && add_cppflags -D_FILE_OFFSET_BITS=64
+ #include <stdlib.h>
 @@ -2824,8 +2824,8 @@
      fi
  fi
diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile
index 4f5f3558caa3..dfe881c426e7 100644
--- a/multimedia/ffmpeg/Makefile
+++ b/multimedia/ffmpeg/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ffmpeg
 PORTVERSION=	0.6.1
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	multimedia audio ipv6 net
 MASTER_SITES=	http://ffmpeg.org/releases/
diff --git a/multimedia/ffmpeg/files/patch-configure b/multimedia/ffmpeg/files/patch-configure
index 6c33c062298e..ccf595dadefa 100644
--- a/multimedia/ffmpeg/files/patch-configure
+++ b/multimedia/ffmpeg/files/patch-configure
@@ -1,5 +1,5 @@
 --- configure.orig	2010-06-15 21:44:30.000000000 +0200
-+++ configure	2010-08-01 20:32:42.201110812 +0200
++++ configure	2010-12-12 22:19:20.533163967 +0100
 @@ -1469,7 +1469,7 @@
  nm_opts='-g'
  
@@ -9,6 +9,24 @@
  cpu="generic"
  
  # OS
+@@ -1514,7 +1514,7 @@
+ 
+ CC_O='-o $@'
+ 
+-host_cflags='-D_ISOC99_SOURCE -D_POSIX_C_SOURCE=200112 -O3 -g -Wall'
++host_cflags='-D_ISOC99_SOURCE -O3 -g -Wall'
+ host_libs='-lm'
+ 
+ target_path='$(CURDIR)'
+@@ -2096,7 +2096,7 @@
+     die "C compiler test failed."
+ fi
+ 
+-add_cppflags -D_ISOC99_SOURCE -D_POSIX_C_SOURCE=200112
++add_cppflags -D_ISOC99_SOURCE
+ check_cflags -std=c99
+ check_cc -D_FILE_OFFSET_BITS=64 <<EOF && add_cppflags -D_FILE_OFFSET_BITS=64
+ #include <stdlib.h>
 @@ -2678,8 +2678,8 @@
      fi
  fi