From 4a4d3b592dede32e31cf21a63a85c0f2517a3d97 Mon Sep 17 00:00:00 2001
From: Jan Beich <jbeich@FreeBSD.org>
Date: Sat, 25 Mar 2017 03:29:09 +0000
Subject: [PATCH] audio/oss: update to 4.2.b2017 (maintenance release)

- Add a note about origin to avoid users from Linux blaming FreeBSD
  for 4Front's bugs and vice versa
- Disable SSE on amd64 to avoid kernel panic[1]

Changes:	http://opensound.com/forum/viewtopic.php?f=19&t=5841
PR:		212263
Submitted by:	Jakub Adler <jakubadler@gmail.com> [1]
MFH:		2017Q1
---
 audio/oss/Makefile                               |  4 ++--
 audio/oss/distinfo                               |  5 +++--
 audio/oss/files/patch-setup_srcconf__freebsd.inc | 10 ++++++++++
 audio/oss/pkg-descr                              |  3 +++
 audio/oss/pkg-plist                              |  2 ++
 5 files changed, 20 insertions(+), 4 deletions(-)
 create mode 100644 audio/oss/files/patch-setup_srcconf__freebsd.inc

diff --git a/audio/oss/Makefile b/audio/oss/Makefile
index 09f7079fe407..2fc81691d0f2 100644
--- a/audio/oss/Makefile
+++ b/audio/oss/Makefile
@@ -2,13 +2,13 @@
 # $FreeBSD$
 
 PORTNAME=	oss
-DISTVERSION=	4.2-build2011
+DISTVERSION=	4.2-build2017
 CATEGORIES=	audio
 MASTER_SITES=	http://www.opensound.com/developer/sources/stable/bsd/
 DISTNAME=	${PORTNAME}-v${DISTVERSION}-src-bsd
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Open Sound System
+COMMENT=	Open Sound System from 4Front Technologies
 
 LICENSE=	BSD2CLAUSE
 
diff --git a/audio/oss/distinfo b/audio/oss/distinfo
index 49c84208da4f..0663abaa9308 100644
--- a/audio/oss/distinfo
+++ b/audio/oss/distinfo
@@ -1,2 +1,3 @@
-SHA256 (oss-v4.2-build2011-src-bsd.tar.bz2) = 65ba999222d7250242c23d6d13e98dc39d3157c14acc32691d8aa9678ccedbbc
-SIZE (oss-v4.2-build2011-src-bsd.tar.bz2) = 1628950
+TIMESTAMP = 1486110185
+SHA256 (oss-v4.2-build2017-src-bsd.tar.bz2) = 8ef2b1b964719b4c356de234d4b28832302027dc23bf636820be1afe1b099972
+SIZE (oss-v4.2-build2017-src-bsd.tar.bz2) = 1714709
diff --git a/audio/oss/files/patch-setup_srcconf__freebsd.inc b/audio/oss/files/patch-setup_srcconf__freebsd.inc
new file mode 100644
index 000000000000..93e64ff7948b
--- /dev/null
+++ b/audio/oss/files/patch-setup_srcconf__freebsd.inc
@@ -0,0 +1,10 @@
+--- setup/srcconf_freebsd.inc.orig	2014-02-14 22:59:55 UTC
++++ setup/srcconf_freebsd.inc
+@@ -12,6 +12,6 @@ add_kernel_flags (FILE * f)
+ {
+ # if defined(__x86_64__)
+   fprintf (f,
+-	     "CFLAGS += -O3 -fno-common  -mcmodel=kernel -mno-red-zone  -fno-asynchronous-unwind-tables -ffreestanding\n");
++	     "CFLAGS += -O3 -fno-common  -mcmodel=kernel -mno-red-zone  -fno-asynchronous-unwind-tables -ffreestanding -mno-sse\n");
+ # endif
+ }
diff --git a/audio/oss/pkg-descr b/audio/oss/pkg-descr
index f34f27916679..696c91e4a558 100644
--- a/audio/oss/pkg-descr
+++ b/audio/oss/pkg-descr
@@ -2,4 +2,7 @@ Open Sound System for FreeBSD is a audio subsystem that provides
 a cross platform audio and MIDI API with device drivers for most
 consumer and professional PCI and USB audio devices.
 
+Not to be confused with sound(4) which is a different implementation
+with the same API.
+
 WWW: http://opensound.com/
diff --git a/audio/oss/pkg-plist b/audio/oss/pkg-plist
index 3176265240d3..14cd6b6afc8c 100644
--- a/audio/oss/pkg-plist
+++ b/audio/oss/pkg-plist
@@ -29,6 +29,7 @@ lib/oss/conf/oss_ymf7xx.conf.sample
 lib/oss/conf/osscore.conf.sample
 lib/oss/etc/devices.list
 lib/oss/include/sys/soundcard.h
+lib/oss/modules/lynxone.ko
 lib/oss/modules/oss_ali5455.ko
 lib/oss/modules/oss_atiaudio.ko
 lib/oss/modules/oss_audigyls.ko
@@ -73,6 +74,7 @@ man/man1/osstest.1.gz
 man/man1/ossxmix.1.gz
 man/man1/soundoff.1.gz
 man/man1/soundon.1.gz
+man/man7/lynxone.7.gz
 man/man7/oss_ali5455.7.gz
 man/man7/oss_atiaudio.7.gz
 man/man7/oss_audigyls.7.gz