From 34ca539c76df9e4035f7bf87cf7af464708e656e Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Mon, 9 May 2016 17:55:44 +0000
Subject: [PATCH] lame: fix x86 gcc5 build.

* with patch from FreeBSD ports.
---
 media-sound/lame/lame-3.99.5.recipe           |  4 +-
 media-sound/lame/patches/lame-3.99.5.patch    | 13 -----
 media-sound/lame/patches/lame-3.99.5.patchset | 58 +++++++++++++++++++
 3 files changed, 60 insertions(+), 15 deletions(-)
 delete mode 100644 media-sound/lame/patches/lame-3.99.5.patch
 create mode 100644 media-sound/lame/patches/lame-3.99.5.patchset

diff --git a/media-sound/lame/lame-3.99.5.recipe b/media-sound/lame/lame-3.99.5.recipe
index c1fd1c70b..f62e8c771 100644
--- a/media-sound/lame/lame-3.99.5.recipe
+++ b/media-sound/lame/lame-3.99.5.recipe
@@ -23,10 +23,10 @@ files."
 HOMEPAGE="http://lame.sourceforge.net/"
 COPYRIGHT="1998-2012 Mike Cheng et al."
 LICENSE="GNU LGPL v2"
-REVISION="6"
+REVISION="7"
 SOURCE_URI="http://downloads.sourceforge.net/project/lame/lame/3.99/lame-$portVersion.tar.gz"
 CHECKSUM_SHA256="24346b4158e4af3bd9f2e194bb23eb473c75fb7377011523353196b19b9a23ff"
-PATCHES="lame-$portVersion.patch"
+PATCHES="lame-$portVersion.patchset"
 ADDITIONAL_FILES="
 	gtk.m4
 	lib-link.m4
diff --git a/media-sound/lame/patches/lame-3.99.5.patch b/media-sound/lame/patches/lame-3.99.5.patch
deleted file mode 100644
index 9973b6bf2..000000000
--- a/media-sound/lame/patches/lame-3.99.5.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -urN lame-3.99.5/configure.in lame-3.99.5-haiku/configure.in
---- lame-3.99.5/configure.in	2010-06-21 14:16:05.000000000 +0000
-+++ lame-3.99.5-haiku/configure.in	2010-06-21 15:12:31.000000000 +0000
-@@ -343,6 +343,9 @@
- 		*solaris*)
- 			LIBS="$LIBS -lnsl"
- 			;;
-+		*haiku*)
-+			LIBS="$LIBS -lnetwork"
-+			;;
- 		esac
- 	fi
- fi
diff --git a/media-sound/lame/patches/lame-3.99.5.patchset b/media-sound/lame/patches/lame-3.99.5.patchset
new file mode 100644
index 000000000..de8d38a22
--- /dev/null
+++ b/media-sound/lame/patches/lame-3.99.5.patchset
@@ -0,0 +1,58 @@
+From e84cdbab22495ef11cae16c4199d5b29ed883960 Mon Sep 17 00:00:00 2001
+From: Jerome Duval <jerome.duval@gmail.com>
+Date: Mon, 9 May 2016 17:35:45 +0000
+Subject: applying patch lame-3.99.5.patch
+
+
+diff --git a/configure.in b/configure.in
+index 2f8fa66..c1d8c8c 100644
+--- a/configure.in
++++ b/configure.in
+@@ -349,6 +349,9 @@ if test $ac_cv_func_socket = no; then
+ 		*solaris*)
+ 			LIBS="$LIBS -lnsl"
+ 			;;
++		*haiku*)
++			LIBS="$LIBS -lnetwork"
++			;;
+ 		esac
+ 	fi
+ fi
+-- 
+2.2.2
+
+
+From 11cadc735d46907efa4b15e8295e56c5c449d49f Mon Sep 17 00:00:00 2001
+From: Jerome Duval <jerome.duval@gmail.com>
+Date: Mon, 9 May 2016 17:51:14 +0000
+Subject: gcc5 patch from FreeBSD ports.
+
+
+diff --git a/configure.in b/configure.in
+index c1d8c8c..bed1271 100644
+--- a/configure.in
++++ b/configure.in
+@@ -96,9 +96,19 @@ AC_CHECK_HEADERS( \
+ 		 sys/soundcard.h \
+ 		 sys/time.h \
+ 		 unistd.h \
+-		 xmmintrin.h \
+ 		 linux/soundcard.h)
+ 
++dnl Checks for actually working SSE intrinsics
++AC_MSG_CHECKING(working SSE intrinsics)
++AC_COMPILE_IFELSE(
++    [AC_LANG_PROGRAM(
++	[[#include <xmmintrin.h>]],
++	[[_mm_sfence();]])],
++    [AC_DEFINE([HAVE_XMMINTRIN_H], [1], [Define if SSE intrinsics work.])
++     ac_cv_header_xmmintrin_h=yes],
++   [ac_cv_header_xmmintrin_h=no])
++AC_MSG_RESULT(${ac_cv_header_xmmintrin_h})
++
+ dnl Checks for typedefs, structures, and compiler characteristics.
+ AC_C_CONST
+ AC_C_INLINE
+-- 
+2.2.2
+