2015-08-02 Ryoichi INAGAKI <ryo1@toki.waseda.jp>

	* self-build-broadcom-wl: added patch for kernel 3.18
	* xfce4-embed-plugin, xfce4-verve-plugin, xfdesktop: updated
	


git-svn-id: http://trac.vinelinux.org/repos/projects/specs@9688 ec354946-7b23-47d6-9f5a-488ba84defc7

nonfree/self-build-broadcom-wl/broadcom-wl-kernel318.patch

@@ -0,0 +1,45 @@
+--- src/wl/sys/wl_linux.c.orig	2014-06-26 03:42:08.000000000 -0700
++++ src/wl/sys/wl_linux.c	2015-07-29 06:37:51.000000000 -0700
+@@ -1307,7 +1307,11 @@
+ 	dev->priv = priv_link;
+ #else
+ 
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 17, 0))
+ 	dev = alloc_netdev(sizeof(priv_link_t), intf_name, ether_setup);
++#else
++	dev = alloc_netdev(sizeof(priv_link_t), intf_name, NET_NAME_UNKNOWN, ether_setup);
++#endif
+ 	if (!dev) {
+ 		WL_ERROR(("wl%d: %s: alloc_netdev failed\n",
+ 			(wl->pub)?wl->pub->unit:wlif->subunit, __FUNCTION__));
+--- src/wl/sys/wl_cfg80211_hybrid.c.orig	2014-06-26 03:42:08.000000000 -0700
++++ src/wl/sys/wl_cfg80211_hybrid.c	2015-07-29 07:03:39.000000000 -0700
+@@ -2010,9 +2010,15 @@
+ 
+ 	notify_ie = (u8 *)bi + le16_to_cpu(bi->ie_offset);
+ 	notify_ielen = le32_to_cpu(bi->ie_length);
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 18, 0))
+ 	cbss = cfg80211_inform_bss(wiphy, channel, (const u8 *)(bi->BSSID.octet),
+ 		0, beacon_proberesp->capab_info, beacon_proberesp->beacon_int,
+ 		(const u8 *)notify_ie, notify_ielen, signal, GFP_KERNEL);
++#else
++	cbss = cfg80211_inform_bss(wiphy, channel, CFG80211_BSS_FTYPE_UNKNOWN, (const u8 *)(bi->BSSID.octet),
++		0, beacon_proberesp->capab_info, beacon_proberesp->beacon_int,
++		(const u8 *)notify_ie, notify_ielen, signal, GFP_KERNEL);
++#endif
+ 
+ 	if (unlikely(!cbss))
+ 		return -ENOMEM;
+@@ -2071,7 +2077,12 @@
+ 			wl_get_assoc_ies(wl);
+ 			memcpy(&wl->bssid, &e->addr, ETHER_ADDR_LEN);
+ 			wl_update_bss_info(wl);
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 15, 0))
+ 			cfg80211_ibss_joined(ndev, (u8 *)&wl->bssid, GFP_KERNEL);
++#else
++			cfg80211_ibss_joined(ndev, (u8 *)&wl->bssid,
++					     &wl->conf->channel, GFP_KERNEL);
++#endif
+ 			set_bit(WL_STATUS_CONNECTED, &wl->status);
+ 			wl->profile->active = true;
+ 		}

nonfree/self-build-broadcom-wl/broadcom-wl-vl.spec

@@ -0,0 +1,121 @@
+%define oname	hybrid-portsrc
+%define over	%(echo %{version} | tr . _)
+%define kname	wl
+
+Summary:	Proprietary driver for Broadcom wireless adapters
+Summary(ja): 	Broadcom ワイヤレスドライバ用プロプライエタリドライバ
+Name:		broadcom-wl
+Version:	##VERSION##
+Release: 	##RELEASE##
+
+License:	Freeware and GPLv2 with exception
+Group:		System Environment/Kernel
+URL:		http://www.broadcom.com/support/802.11/linux_sta.php
+
+%ifarch %{ix86}
+Source0:	http://www.broadcom.com/docs/linux_sta/hybrid-v35-nodebug-pcoem-%{over}.tar.gz
+%endif
+%ifarch x86_64
+Source0:	http://www.broadcom.com/docs/linux_sta/hybrid-v35_64-nodebug-pcoem-%{over}.tar.gz
+%endif
+Source1:	blacklist-broadcom.conf
+
+Patch100:	broadcom-wl-kernel318.patch
+
+BuildRoot:	%{_tmppath}/%{name}-%{version}-root
+
+%description
+This package contains the proprietary driver for Broadcom wireless adapters
+provided by Broadcom. If installed, it will be used for these cards in
+preference to the third-party open source driver that requires manual
+installation of firmware, or ndiswrapper.
+
+%description -l ja
+このパッケージには、Broadcom ワイヤレスアダプタ用のプロプライエタリドライバが
+収録されています。ファームウェアのインストールを手で行わなければいけない
+オープンソースドライバや ndiswrapper とは異なり、この Broadcom 社製の
+ハイブリッドドライバは単体で動作します。
+
+
+%package -n dkms-%{name}
+Summary:	 Hybrid kernel module f-r Broadcom wireless adapters
+Summary(ja):	 Broadcom ワイヤレスドライバ用ハイブリッドカーネルモジュール
+Group:		 System Environment/Kernel
+Requires(post):	 dkms
+Requires(preun): dkms
+
+%description -n dkms-%{name}
+This package contains the proprietary driver for Broadcom wireless adapters
+provided by Broadcom. If installed, it will be used for these cards in
+preference to the third-party open source driver that requires manual
+installation of firmware, or ndiswrapper.
+
+%description -n dkms-%{name} -l ja
+このパッケージには、Broadcom ワイヤレスアダプタ用のプロプライエタリドライバが
+収録されています。ファームウェアのインストールを手で行わなければいけない
+オープンソースドライバや ndiswrapper とは異なり、この Broadcom 社製の
+ハイブリッドドライバは単体で動作します。
+
+
+%prep
+%setup -q -T -c -a0
+%patch100 -p0 -b .kernel318
+
+%install
+%{__rm} -rf %{buildroot}
+
+## DKMS ##
+mkdir -p %{buildroot}%{_usr}/src/%{name}-%{version}-%{release}
+cp -R * %{buildroot}%{_usr}/src/%{name}-%{version}-%{release}/
+cat > %{buildroot}%{_usr}/src/%{name}-%{version}-%{release}/dkms.conf << EOF
+PACKAGE_NAME=%{name}
+PACKAGE_VERSION=%{version}-%{release}
+
+BUILT_MODULE_NAME[0]="%{kname}"
+BUILT_MODULE_LOCATION[0]="."
+DEST_MODULE_LOCATION[0]="/kernel/drivers/net/wireless"
+
+MAKE[0]="make"
+CLEAN="make clean"
+
+AUTOINSTALL="yes"
+EOF
+
+## BLACKLIST ##
+mkdir -p %{buildroot}/etc/modprobe.d
+install -m 644 %{SOURCE1} %{buildroot}/etc/modprobe.d/
+
+
+%clean
+%{__rm} -rf %{buildroot}
+
+
+%post -n dkms-%{name}
+dkms add     -m %{name} -v %{version}-%{release} --rpm_safe_upgrade
+dkms build   -m %{name} -v %{version}-%{release} --rpm_safe_upgrade
+dkms install -m %{name} -v %{version}-%{release} --rpm_safe_upgrade
+exit 0
+
+%preun -n dkms-%{name}
+dkms remove  -m %{name} -v %{version}-%{release} --rpm_safe_upgrade --all || :
+
+
+%files -n dkms-%{name}
+%defattr(-,root,root)
+%doc lib/LICENSE.txt
+%dir /usr/src/%{name}-%{version}-%{release}
+/usr/src/%{name}-%{version}-%{release}/*
+/etc/modprobe.d/blacklist-broadcom.conf
+
+
+%changelog
+* Sun Aug  2 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 6.30.223.248-2
+- added Source100 to build with kernel 3.18
+
+* Wed Nov 19 2014 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 6.30.223.248-1
+- new upstream release
+- dropped SOURCE2
+- updated dmks.conf
+
+* Tue May 05 2009 MATSUBAYASHI Kohji <shaolin@vinelinux.org> 5.10.91.9-1
+- initial build for Vine Linux

nonfree/self-build-broadcom-wl/self-build-broadcom-wl-vl.spec

@@ -15,10 +15,12 @@ Summary:	Package to automatically build %{pkgname} rpm package
 Summary(ja): 	%{pkgname} の rpm パッケージを自動作成するパッケージ
 Name:		%{name}
 Version:	6.30.223.248
-Release: 	1%{?_dist_release}
-Source0:	%{pkgname}.spec
+Release: 	2%{?_dist_release}
+Source0:	%{pkgname}-vl.spec
 Source1:	blacklist-broadcom.conf
 
+Source100:	broadcom-wl-kernel318.patch
+
 License:	Freeware and GPLv2 with exception
 Group:		Restricted Software
 
@@ -92,7 +94,10 @@ install -d %{buildroot}%{_datadir}/%{name}
 install -m 644 %{SOURCE1} %{buildroot}%{_datadir}/%{name}
 #install -m 644 %{SOURCE2} %{buildroot}%{_datadir}/%{name}
 sed -e 's|##VERSION##|%{version}|g' -e 's|##RELEASE##|%{release}|g' \
-	%{SOURCE0} > %{buildroot}%{_datadir}/%{name}/%{pkgname}.spec
+	%{SOURCE0} > %{buildroot}%{_datadir}/%{name}/%{pkgname}-vl.spec
+
+%{__install} -m 644 %{SOURCE100} \
+	     $RPM_BUILD_ROOT/%{_datadir}/%{name}
 
 
 %clean
@@ -100,7 +105,7 @@ rm -rf %{buildroot}
 
 
 %posttrans
-/usr/lib/rpm/self-build-rpm.sh %{name} %{pkgname}.spec "%{source0path}"
+/usr/lib/rpm/self-build-rpm.sh %{name} %{pkgname}-vl.spec "%{source0path}"
 /usr/lib/rpm/pre-allocate-rpm.sh dkms-%{pkgname}-%{version}-%{release}
 
 
@@ -110,6 +115,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sun Aug  2 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 6.30.223.248-2
+- added Source100 to build with kernel 3.18
+
 * Wed Nov 19 2014 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 6.30.223.248-1
 - new upstream release
 - dropped SOURCE2

x/xfce4-embed-plugin/xfce4-embed-plugin-vl.spec

@@ -1,8 +1,8 @@
 Name: 		xfce4-embed-plugin
 Summary:        Embed plugin for the Xfce panel
 Summary(ja):    Xfce パネル用 Window 埋め込みプラグイン
-Version:        1.4.1
-Release: 	2%{?_dist_release}
+Version:        1.6.0
+Release: 	1%{?_dist_release}
 
 Group: 		User Interface/Desktops
 License:	GPLv2+
@@ -59,6 +59,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/xfce4/panel/plugins/embed.desktop
 
 %changelog
+* Mon Jul 20 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 1.6.0-1
+- new upstream release
+
 * Mon Mar  2 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 1.4.1-2
 - rebuilt with libxfce4util 4.12.1
 

x/xfce4-verve-plugin/xfce4-verve-plugin-vl.spec

@@ -1,7 +1,7 @@
 Name: 		xfce4-verve-plugin
 Summary:        Command line plugin for the Xfce4 panel
 Summary(ja):    Xfce パネル用 CPU コマンドラインプラグイン
-Version:        1.0.1
+Version:        1.1.0
 Release: 	1%{?_dist_release}
 
 Group: 		User Interface/Desktops
@@ -63,6 +63,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/xfce4/panel/plugins/%{name}.desktop
 
 %changelog
+* Mon Jul 20 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 1.1.0-1
+- new upstream release
+
 * Mon Mar  2 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 1.0.1-1
 - updated to 1.0.1
 - changed BR: libxfce4ui-devel instead of libxfcegui4-devel

x/xfdesktop/xfdesktop-vl.spec

@@ -1,5 +1,5 @@
 Name: 		xfdesktop
-Version: 	4.12.2
+Version: 	4.12.3
 Release: 	1%{?_dist_release}
 Summary: 	Desktop manager for the Xfce
 Summary(ja): 	Xfce デスクトップマネージャ
@@ -78,6 +78,9 @@ fi
 %{_mandir}/man1/*
 
 %changelog
+* Mon Jul 20 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 4.12.3-1
+- new upstream release
+
 * Thu May 21 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 4.12.2-1
 - new upstream release