From 2feda6d73f607acb2418f3c4410a5b34e706aa62 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Sun, 7 Jul 2019 15:29:02 +0100
Subject: sys-kernel/broadcom-sta-dkms : add kernel 5.1 compat patch

---
 .../broadcom-sta-dkms-6.30.223.271-r2.ebuild       | 59 --------------------
 .../broadcom-sta-dkms-6.30.223.271-r3.ebuild       | 63 ++++++++++++++++++++++
 .../broadcom-sta-6.30.223.271-r4-linux-5.1.patch   | 15 ++++++
 .../broadcom-sta-dkms/files/broadcom-sta-dkms.conf |  8 +++
 4 files changed, 86 insertions(+), 59 deletions(-)
 delete mode 100644 sys-kernel/broadcom-sta-dkms/broadcom-sta-dkms-6.30.223.271-r2.ebuild
 create mode 100644 sys-kernel/broadcom-sta-dkms/broadcom-sta-dkms-6.30.223.271-r3.ebuild
 create mode 100644 sys-kernel/broadcom-sta-dkms/files/broadcom-sta-6.30.223.271-r4-linux-5.1.patch
 create mode 100644 sys-kernel/broadcom-sta-dkms/files/broadcom-sta-dkms.conf

diff --git a/sys-kernel/broadcom-sta-dkms/broadcom-sta-dkms-6.30.223.271-r2.ebuild b/sys-kernel/broadcom-sta-dkms/broadcom-sta-dkms-6.30.223.271-r2.ebuild
deleted file mode 100644
index fb55cb82..00000000
--- a/sys-kernel/broadcom-sta-dkms/broadcom-sta-dkms-6.30.223.271-r2.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils
-
-DESCRIPTION="Broadcom's IEEE 802.11a/b/g/n hybrid Linux device driver source"
-HOMEPAGE="http://www.broadcom.com/support/802.11/"
-SRC_BASE="http://www.broadcom.com/docs/linux_sta/hybrid-v35"
-SRC_URI="amd64? ( ${SRC_BASE}_64-nodebug-pcoem-${PV//\./_}.tar.gz )
-	http://www.broadcom.com/docs/linux_sta/README_${PV}.txt -> README-${P}.txt"
-
-LICENSE="Broadcom"
-KEYWORDS="amd64"
-SLOT="0"
-RESTRICT="mirror"
-
-DEPEND="sys-kernel/dkms"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"
-
-src_prepare() {
-	cp "${FILESDIR}"/dkms.conf "${S}" || die
-	
-	epatch \
-		"${FILESDIR}/broadcom-sta-6.30.223.141-makefile.patch" \
-		"${FILESDIR}/broadcom-sta-6.30.223.141-eth-to-wlan.patch" \
-		"${FILESDIR}/broadcom-sta-6.30.223.141-gcc.patch" \
-		"${FILESDIR}/broadcom-sta-6.30.223.248-r3-Wno-date-time.patch" \
-		"${FILESDIR}/broadcom-sta-6.30.223.271-r1-linux-3.18.patch" \
-		"${FILESDIR}/broadcom-sta-6.30.223.271-r2-linux-4.3-v2.patch" \
-		"${FILESDIR}/broadcom-sta-6.30.223.271-r4-linux-4.7.patch" \
-		"${FILESDIR}/broadcom-sta-6.30.223.271-r4-linux-4.8.patch" \
-		"${FILESDIR}/broadcom-sta-6.30.223.271-r4-linux-4.11.patch" \
-		"${FILESDIR}/broadcom-sta-6.30.223.271-r4-linux-4.12.patch" \
-		"${FILESDIR}/broadcom-sta-6.30.223.271-r4-linux-4.15.patch"
-
-	epatch_user
-}
-
-src_compile(){
-    :
-}
-
-src_install() {
-    dodir usr/src/${P}
-    insinto usr/src/${P}
-    doins -r "${S}"/*
-}
-
-pkg_postinst() {
-    dkms add ${PN}/${PV}
-}
-
-pkg_prerm() {
-    dkms remove ${PN}/${PV} --all
-}
diff --git a/sys-kernel/broadcom-sta-dkms/broadcom-sta-dkms-6.30.223.271-r3.ebuild b/sys-kernel/broadcom-sta-dkms/broadcom-sta-dkms-6.30.223.271-r3.ebuild
new file mode 100644
index 00000000..cfc26418
--- /dev/null
+++ b/sys-kernel/broadcom-sta-dkms/broadcom-sta-dkms-6.30.223.271-r3.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils
+
+DESCRIPTION="Broadcom's IEEE 802.11a/b/g/n hybrid Linux device driver source"
+HOMEPAGE="http://www.broadcom.com/support/802.11/"
+SRC_BASE="http://www.broadcom.com/docs/linux_sta/hybrid-v35"
+SRC_URI="amd64? ( ${SRC_BASE}_64-nodebug-pcoem-${PV//\./_}.tar.gz )
+	http://www.broadcom.com/docs/linux_sta/README_${PV}.txt -> README-${P}.txt"
+
+LICENSE="Broadcom"
+KEYWORDS="amd64"
+SLOT="0"
+RESTRICT="mirror"
+
+DEPEND="sys-kernel/dkms"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}"
+
+src_prepare() {
+	cp "${FILESDIR}"/dkms.conf "${S}" || die
+
+	epatch \
+		"${FILESDIR}/broadcom-sta-6.30.223.141-makefile.patch" \
+		"${FILESDIR}/broadcom-sta-6.30.223.141-eth-to-wlan.patch" \
+		"${FILESDIR}/broadcom-sta-6.30.223.141-gcc.patch" \
+		"${FILESDIR}/broadcom-sta-6.30.223.248-r3-Wno-date-time.patch" \
+		"${FILESDIR}/broadcom-sta-6.30.223.271-r1-linux-3.18.patch" \
+		"${FILESDIR}/broadcom-sta-6.30.223.271-r2-linux-4.3-v2.patch" \
+		"${FILESDIR}/broadcom-sta-6.30.223.271-r4-linux-4.7.patch" \
+		"${FILESDIR}/broadcom-sta-6.30.223.271-r4-linux-4.8.patch" \
+		"${FILESDIR}/broadcom-sta-6.30.223.271-r4-linux-4.11.patch" \
+		"${FILESDIR}/broadcom-sta-6.30.223.271-r4-linux-4.12.patch" \
+		"${FILESDIR}/broadcom-sta-6.30.223.271-r4-linux-4.15.patch" \
+		"${FILESDIR}/broadcom-sta-6.30.223.271-r4-linux-5.1.patch"
+
+	epatch_user
+}
+
+src_compile(){
+	:
+}
+
+src_install() {
+	dodir usr/src/${P}
+	insinto usr/src/${P}
+	doins -r "${S}"/*
+	dodir etc/modprobe.d
+	insinto etc/modprobe.d
+	doins "${FILESDIR}"/"${PN}".conf
+}
+
+pkg_postinst() {
+	dkms add ${PN}/${PV}
+}
+
+pkg_prerm() {
+	dkms remove ${PN}/${PV} --all
+}
diff --git a/sys-kernel/broadcom-sta-dkms/files/broadcom-sta-6.30.223.271-r4-linux-5.1.patch b/sys-kernel/broadcom-sta-dkms/files/broadcom-sta-6.30.223.271-r4-linux-5.1.patch
new file mode 100644
index 00000000..6be2c4f5
--- /dev/null
+++ b/sys-kernel/broadcom-sta-dkms/files/broadcom-sta-6.30.223.271-r4-linux-5.1.patch
@@ -0,0 +1,15 @@
+diff --git a/src/wl/sys/wl_cfg80211_hybrid.c b/src/wl/sys/wl_cfg80211_hybrid.c
+index cdf8c01..63b5650 100644
+--- a/src/wl/sys/wl_cfg80211_hybrid.c
++++ b/src/wl/sys/wl_cfg80211_hybrid.c
+@@ -52,6 +52,10 @@ u32 wl_dbg_level = WL_DBG_ERR | WL_DBG_INFO;
+ u32 wl_dbg_level = WL_DBG_ERR;
+ #endif
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 1, 0)
++#define get_ds()	((mm_segment_t) { (-1UL) })
++#endif
++
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0)
+ static s32 wl_cfg80211_change_iface(struct wiphy *wiphy, struct net_device *ndev,
+            enum nl80211_iftype type, struct vif_params *params);
diff --git a/sys-kernel/broadcom-sta-dkms/files/broadcom-sta-dkms.conf b/sys-kernel/broadcom-sta-dkms/files/broadcom-sta-dkms.conf
new file mode 100644
index 00000000..8266df4b
--- /dev/null
+++ b/sys-kernel/broadcom-sta-dkms/files/broadcom-sta-dkms.conf
@@ -0,0 +1,8 @@
+blacklist b43
+blacklist b43legacy
+blacklist ssb
+blacklist bcm43xx
+blacklist brcm80211
+blacklist brcmfmac
+blacklist brcmsmac
+blacklist bcma
-- 
cgit v1.2.3