rpms/nvidia-xconfig/devel .cvsignore,1.21,1.22 sources,1.21,1.22
by Leigh Scott
Author: leigh123linux
Update of /cvs/nonfree/rpms/nvidia-xconfig/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv6260
Modified Files:
.cvsignore sources
Log Message:
* Tue Oct 16 2012 Leigh Scott <leigh123linux(a)googlemail.com> - 1.0-25
- Update to 310.14
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-xconfig/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore 24 Sep 2012 18:25:31 -0000 1.21
+++ .cvsignore 16 Oct 2012 22:24:35 -0000 1.22
@@ -1 +1 @@
-nvidia-xconfig-304.51.tar.bz2
+nvidia-xconfig-310.14.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-xconfig/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources 24 Sep 2012 18:25:31 -0000 1.21
+++ sources 16 Oct 2012 22:24:35 -0000 1.22
@@ -1 +1 @@
-45f8899feb58357ff19017b200da3e79 nvidia-xconfig-304.51.tar.bz2
+ef0776f5065b77e46c80a2350f4fcc0f nvidia-xconfig-310.14.tar.bz2
11 years, 11 months
rpms/xorg-x11-drv-nvidia/devel xorg-x11-drv-nvidia.spec,1.87,1.88
by Leigh Scott
Author: leigh123linux
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv6039
Modified Files:
xorg-x11-drv-nvidia.spec
Log Message:
* Tue Oct 16 2012 Leigh Scott <leigh123linux(a)googlemail.com> - 1:310.14-1
- Update to 310.14
Index: xorg-x11-drv-nvidia.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/devel/xorg-x11-drv-nvidia.spec,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- xorg-x11-drv-nvidia.spec 16 Oct 2012 21:35:14 -0000 1.87
+++ xorg-x11-drv-nvidia.spec 16 Oct 2012 22:21:11 -0000 1.88
@@ -7,7 +7,7 @@
Name: xorg-x11-drv-nvidia
Epoch: 1
Version: 310.14
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards
Group: User Interface/X Hardware Support
@@ -82,6 +82,7 @@
%filter_from_requires /^libnvidia/d;
%filter_from_requires /^libGLCore\.so/d;
%filter_from_requires /^libGL\.so/d;
+%filter_from_requires /^libnvcuvid/d;
%filter_from_requires /^libvdpau_nvidia\.so\.1/d;
%filter_from_requires /^libglx\.so/d;
%filter_setup
@@ -340,6 +341,7 @@
%config %{_sysconfdir}/ld.so.conf.d/nvidia-%{_lib}.conf
%{nvidialibdir}/*.so.*
%{nvidialibdir}/libcuda.so
+%{nvidialibdir}/libnvcuvid.so
%{nvidialibdir}/libnvidia-glcore.so
%{nvidialibdir}/tls/*.so*
%exclude %{_libdir}/vdpau/libvdpau.*
@@ -353,13 +355,15 @@
%{nvidialibdir}/libOpenCL.so
%{nvidialibdir}/libnvidia-compiler.so
%{nvidialibdir}/libGL.so
-%{nvidialibdir}/libnvcuvid.so
%{nvidialibdir}/libnvidia-ml.so
%{nvidialibdir}/libnvidia-opencl.so
%{nvidialibdir}/libnvidia-encode.so
%changelog
+* Tue Oct 16 2012 Leigh Scott <leigh123linux(a)googlemail.com> - 1:310.14-2
+- move libnvcuvid.so to main package
+
* Tue Oct 16 2012 Leigh Scott <leigh123linux(a)googlemail.com> - 1:310.14-1
- Update to 310.14
11 years, 11 months
rpms/nvidia-settings/devel .cvsignore, 1.22, 1.23 nvidia-settings.spec, 1.25, 1.26 sources, 1.22, 1.23
by Leigh Scott
Author: leigh123linux
Update of /cvs/nonfree/rpms/nvidia-settings/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv5075
Modified Files:
.cvsignore nvidia-settings.spec sources
Log Message:
* Tue Oct 16 2012 Leigh Scott <leigh123linux(a)googlemail.com> - 1.0-27
- Update to 310.14
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-settings/devel/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore 24 Sep 2012 18:20:15 -0000 1.22
+++ .cvsignore 16 Oct 2012 21:55:28 -0000 1.23
@@ -1 +1 @@
-nvidia-settings-304.51.tar.bz2
+nvidia-settings-310.14.tar.bz2
Index: nvidia-settings.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-settings/devel/nvidia-settings.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- nvidia-settings.spec 24 Sep 2012 18:20:15 -0000 1.25
+++ nvidia-settings.spec 16 Oct 2012 21:55:28 -0000 1.26
@@ -1,7 +1,7 @@
# We use the driver version as a snapshot internal number
# The real version of the package remains 1.0
# This will prevent missunderstanding and versioning changes on the nvidia driver
-%global nversion 304.51
+%global nversion 310.14
#Possible replacement/complement:
#http://willem.engen.nl/projects/disper/
@@ -9,7 +9,7 @@
Name: nvidia-settings
Version: 1.0
-Release: 26%{?dist}
+Release: 27%{?dist}
Summary: Configure the NVIDIA graphics driver
Group: Applications/System
@@ -100,6 +100,9 @@
%changelog
+* Tue Oct 16 2012 Leigh Scott <leigh123linux(a)googlemail.com> - 1.0-27
+- Update to 310.14
+
* Mon Sep 24 2012 Leigh Scott <leigh123linux(a)googlemail.com> - 1.0-26
- Update to 304.51
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-settings/devel/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources 24 Sep 2012 18:20:15 -0000 1.22
+++ sources 16 Oct 2012 21:55:29 -0000 1.23
@@ -1 +1 @@
-be16272d0bfb57700bcf2b7baa68222e nvidia-settings-304.51.tar.bz2
+ba601f28bd9a4649af117d9e006e2225 nvidia-settings-310.14.tar.bz2
11 years, 11 months
rpms/nvidia-xconfig/devel nvidia-xconfig.spec,1.21,1.22
by Leigh Scott
Author: leigh123linux
Update of /cvs/nonfree/rpms/nvidia-xconfig/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv4741
Modified Files:
nvidia-xconfig.spec
Log Message:
* Tue Oct 16 2012 Leigh Scott <leigh123linux(a)googlemail.com> - 1.0-25
- Update to 310.14
Index: nvidia-xconfig.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-xconfig/devel/nvidia-xconfig.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- nvidia-xconfig.spec 24 Sep 2012 18:25:31 -0000 1.21
+++ nvidia-xconfig.spec 16 Oct 2012 21:51:18 -0000 1.22
@@ -1,8 +1,8 @@
-%global nversion 304.51
+%global nversion 310.14
Name: nvidia-xconfig
Version: 1.0
-Release: 24%{?dist}
+Release: 25%{?dist}
Summary: NVIDIA X configuration file editor
Group: Applications/System
@@ -66,6 +66,9 @@
%{_mandir}/man1/nvidia-xconfig.1.*
%changelog
+* Tue Oct 16 2012 Leigh Scott <leigh123linux(a)googlemail.com> - 1.0-25
+- Update to 310.14
+
* Mon Sep 24 2012 Leigh Scott <leigh123linux(a)googlemail.com> - 1.0-24
- Update to 304.51
11 years, 11 months
rpms/nvidia-kmod/devel 3.7_kernel.patch, NONE, 1.1 nvidia-kmod.spec, 1.109, 1.110
by Leigh Scott
Author: leigh123linux
Update of /cvs/nonfree/rpms/nvidia-kmod/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv4437
Modified Files:
nvidia-kmod.spec
Added Files:
3.7_kernel.patch
Log Message:
* Tue Oct 16 2012 Leigh Scott <leigh123linux(a)googlemail.com> - 1:310.14-2
- add patch for 3.7rc kernel
3.7_kernel.patch:
conftest.sh | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
--- NEW FILE 3.7_kernel.patch ---
--- a/nvidiapkg-x64/kernel/conftest.sh
+++ b/nvidiapkg-x64/kernel/conftest.sh
@@ -20,6 +20,7 @@
ISYSTEM=`$CC -print-file-name=include 2> /dev/null`
SOURCES=$4
HEADERS=$SOURCES/include
+HEADERSA=$SOURCES/include/uapi
OUTPUT=$5
XEN_PRESENT=1
@@ -118,7 +119,7 @@
fi
fi
- CFLAGS="$CFLAGS $OUTPUT_CFLAGS -I$HEADERS $AUTOCONF_CFLAGS"
+ CFLAGS="$CFLAGS $OUTPUT_CFLAGS -I$HEADERS -I$HEADERSA $AUTOCONF_CFLAGS"
test_xen
@@ -146,10 +147,10 @@
fi
fi
- CFLAGS="$BASE_CFLAGS $MACH_CFLAGS $OUTPUT_CFLAGS -I$HEADERS $AUTOCONF_CFLAGS"
+ CFLAGS="$BASE_CFLAGS $MACH_CFLAGS $OUTPUT_CFLAGS -I$HEADERS -I$HEADERSA $AUTOCONF_CFLAGS"
if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then
- CFLAGS="$CFLAGS -I$SOURCES/arch/x86/include -I$OUTPUT/arch/x86/include/generated"
+ CFLAGS="$CFLAGS -I$SOURCES/arch/x86/include -I$SOURCES/arch/x86/include/uapi -I$OUTPUT/arch/x86/include/generated -I$OUTPUT/arch/x86/include/generated/uapi"
elif [ "$ARCH" = "arm" ]; then
CFLAGS="$CFLAGS -I$SOURCES/arch/arm/include -I$OUTPUT/arch/arm/include/generated"
fi
Index: nvidia-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/devel/nvidia-kmod.spec,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -r1.109 -r1.110
--- nvidia-kmod.spec 16 Oct 2012 21:38:05 -0000 1.109
+++ nvidia-kmod.spec 16 Oct 2012 21:47:22 -0000 1.110
@@ -9,7 +9,7 @@
Epoch: 1
Version: 310.14
# Taken over by kmodtool
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: NVIDIA display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -25,6 +25,8 @@
Source11: nvidia-kmodtool-excludekernel-filterfile
+Patch0: 3.7_kernel.patch
+
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -51,7 +53,7 @@
for arch in x86 x64
do
pushd nvidiapkg-${arch}
- echo "NoPatch"
+%patch0 -p2
popd
done
@@ -85,6 +87,9 @@
%changelog
+* Tue Oct 16 2012 Leigh Scott <leigh123linux(a)googlemail.com> - 1:310.14-2
+- add patch for 3.7rc kernel
+
* Tue Oct 16 2012 Leigh Scott <leigh123linux(a)googlemail.com> - 1:310.14-1
- Update to 310.14
11 years, 11 months
rpms/nvidia-kmod/devel .cvsignore, 1.50, 1.51 nvidia-kmod.spec, 1.108, 1.109 sources, 1.51, 1.52
by Leigh Scott
Author: leigh123linux
Update of /cvs/nonfree/rpms/nvidia-kmod/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv3959
Modified Files:
.cvsignore nvidia-kmod.spec sources
Log Message:
* Tue Oct 16 2012 Leigh Scott <leigh123linux(a)googlemail.com> - 1:310.14-1
- Update to 310.14
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/devel/.cvsignore,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- .cvsignore 24 Sep 2012 18:13:00 -0000 1.50
+++ .cvsignore 16 Oct 2012 21:38:05 -0000 1.51
@@ -1 +1 @@
-nvidia-kmod-data-304.51.tar.xz
+nvidia-kmod-data-310.14.tar.xz
Index: nvidia-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/devel/nvidia-kmod.spec,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -r1.108 -r1.109
--- nvidia-kmod.spec 24 Sep 2012 18:13:01 -0000 1.108
+++ nvidia-kmod.spec 16 Oct 2012 21:38:05 -0000 1.109
@@ -7,7 +7,7 @@
Name: nvidia-kmod
Epoch: 1
-Version: 304.51
+Version: 310.14
# Taken over by kmodtool
Release: 1%{?dist}
Summary: NVIDIA display driver kernel module
@@ -85,6 +85,9 @@
%changelog
+* Tue Oct 16 2012 Leigh Scott <leigh123linux(a)googlemail.com> - 1:310.14-1
+- Update to 310.14
+
* Mon Sep 24 2012 Leigh Scott <leigh123linux(a)googlemail.com> - 1:304.51-1
- Update to 304.51
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/devel/sources,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- sources 24 Sep 2012 18:13:01 -0000 1.51
+++ sources 16 Oct 2012 21:38:05 -0000 1.52
@@ -1 +1 @@
-318b757d5af8ef9dd086269673c74ca1 nvidia-kmod-data-304.51.tar.xz
+b74f91cd243a547e06f1b295c96838ed nvidia-kmod-data-310.14.tar.xz
11 years, 11 months
rpms/xorg-x11-drv-nvidia/devel .cvsignore, 1.50, 1.51 sources, 1.51, 1.52 xorg-x11-drv-nvidia.spec, 1.86, 1.87
by Leigh Scott
Author: leigh123linux
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv3748
Modified Files:
.cvsignore sources xorg-x11-drv-nvidia.spec
Log Message:
* Tue Oct 16 2012 Leigh Scott <leigh123linux(a)googlemail.com> - 1:310.14-1
- Update to 310.14
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/devel/.cvsignore,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- .cvsignore 24 Sep 2012 18:03:59 -0000 1.50
+++ .cvsignore 16 Oct 2012 21:35:14 -0000 1.51
@@ -1,2 +1,2 @@
-NVIDIA-Linux-x86-304.51.run
-NVIDIA-Linux-x86_64-304.51.run
+NVIDIA-Linux-x86-310.14.run
+NVIDIA-Linux-x86_64-310.14.run
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/devel/sources,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- sources 24 Sep 2012 18:03:59 -0000 1.51
+++ sources 16 Oct 2012 21:35:14 -0000 1.52
@@ -1,2 +1,2 @@
-4fde294e139a31528ea7f6efd8885a09 NVIDIA-Linux-x86-304.51.run
-3144f4a49a13e2ca938255fd42494f0d NVIDIA-Linux-x86_64-304.51.run
+93b6fcf100a94e4e5fafc4ccd740a590 NVIDIA-Linux-x86-310.14.run
+347ffd1c88e57476d26dfd0e36584acc NVIDIA-Linux-x86_64-310.14.run
Index: xorg-x11-drv-nvidia.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/devel/xorg-x11-drv-nvidia.spec,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- xorg-x11-drv-nvidia.spec 24 Sep 2012 18:03:59 -0000 1.86
+++ xorg-x11-drv-nvidia.spec 16 Oct 2012 21:35:14 -0000 1.87
@@ -6,7 +6,7 @@
Name: xorg-x11-drv-nvidia
Epoch: 1
-Version: 304.51
+Version: 310.14
Release: 1%{?dist}
Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards
@@ -78,13 +78,11 @@
%filter_from_provides /^libGLCore\.so/d;
%filter_from_provides /^libGL\.so/d;
%filter_from_provides /^libvdpau_nvidia\.so\.1/d;
-%filter_from_provides /^libXvMCNVIDIA_dynamic\.so\.1/d;
%filter_from_provides /^libglx\.so/d;
%filter_from_requires /^libnvidia/d;
%filter_from_requires /^libGLCore\.so/d;
%filter_from_requires /^libGL\.so/d;
%filter_from_requires /^libvdpau_nvidia\.so\.1/d;
-%filter_from_requires /^libXvMCNVIDIA_dynamic\.so\.1/d;
%filter_from_requires /^libglx\.so/d;
%filter_setup
}
@@ -200,7 +198,6 @@
install -p -m 0755 libglx.so.%{version} $RPM_BUILD_ROOT%{_libdir}/xorg/modules/extensions/nvidia/
install -p -m 0755 nvidia_drv.so $RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers/
install -p -m 0755 libvdpau*.so.%{version} $RPM_BUILD_ROOT%{_libdir}/vdpau/
-install -p -m 0644 libXvMCNVIDIA.a $RPM_BUILD_ROOT%{nvidialibdir}/
# Install binaries
install -p -m 0755 nvidia-{bug-report.sh,smi,cuda-proxy-control,cuda-proxy-server} $RPM_BUILD_ROOT%{_bindir}
@@ -351,19 +348,21 @@
%files devel
%defattr(-,root,root,-)
-%exclude %{nvidialibdir}/libXvMCNVIDIA.a
%exclude %{nvidialibdir}/libcuda.so
%{_includedir}/nvidia/
%{nvidialibdir}/libOpenCL.so
%{nvidialibdir}/libnvidia-compiler.so
%{nvidialibdir}/libGL.so
-%{nvidialibdir}/libXvMCNVIDIA.so
%{nvidialibdir}/libnvcuvid.so
%{nvidialibdir}/libnvidia-ml.so
%{nvidialibdir}/libnvidia-opencl.so
+%{nvidialibdir}/libnvidia-encode.so
%changelog
+* Tue Oct 16 2012 Leigh Scott <leigh123linux(a)googlemail.com> - 1:310.14-1
+- Update to 310.14
+
* Mon Sep 24 2012 Leigh Scott <leigh123linux(a)googlemail.com> - 1:304.51-1
- Update to 304.51
11 years, 11 months
rpms/wl-kmod/F-17 broadcom-wl-5.100.82.112-kernel-3.6.patch, NONE, 1.1 wl-kmod.spec, 1.91, 1.92
by Nicolas Viéville
Author: nvieville
Update of /cvs/nonfree/rpms/wl-kmod/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv32408
Modified Files:
wl-kmod.spec
Added Files:
broadcom-wl-5.100.82.112-kernel-3.6.patch
Log Message:
* Tue Oct 16 2012 Nicolas Vieville <nicolas.vieville(a)univ-valenciennes.fr> - 5.100.82.112-5
- Added patch to build for kernel >= 3.6
broadcom-wl-5.100.82.112-kernel-3.6.patch:
wl_cfg80211.c | 10 ++++++++++
1 file changed, 10 insertions(+)
--- NEW FILE broadcom-wl-5.100.82.112-kernel-3.6.patch ---
diff -Naur hybrid-portsrc_x86_32-v5_100_82_112.orig/src/wl/sys/wl_cfg80211.c hybrid-portsrc_x86_32-v5_100_82_112/src/wl/sys/wl_cfg80211.c
--- hybrid-portsrc_x86_32-v5_100_82_112.orig/src/wl/sys/wl_cfg80211.c 2011-10-22 18:56:55.000000000 +0200
+++ hybrid-portsrc_x86_32-v5_100_82_112/src/wl/sys/wl_cfg80211.c 2012-10-16 14:30:42.882619819 +0200
@@ -42,7 +42,11 @@
enum nl80211_iftype type, u32 *flags, struct vif_params *params);
static s32 __wl_cfg80211_scan(struct wiphy *wiphy, struct net_device *ndev,
struct cfg80211_scan_request *request, struct cfg80211_ssid *this_ssid);
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0)
+static s32 wl_cfg80211_scan(struct wiphy *wiphy,
+#else
static s32 wl_cfg80211_scan(struct wiphy *wiphy, struct net_device *ndev,
+#endif
struct cfg80211_scan_request *request);
static s32 wl_cfg80211_set_wiphy_params(struct wiphy *wiphy, u32 changed);
static s32 wl_cfg80211_join_ibss(struct wiphy *wiphy, struct net_device *dev,
@@ -570,10 +574,16 @@
}
static s32
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0)
+wl_cfg80211_scan(struct wiphy *wiphy,
+#else
wl_cfg80211_scan(struct wiphy *wiphy, struct net_device *ndev,
+#endif
struct cfg80211_scan_request *request)
{
s32 err = 0;
+ struct wl_priv *wl = wiphy_to_wl(wiphy);
+ struct net_device *ndev = wl_to_ndev(wl);
CHECK_SYS_UP();
err = __wl_cfg80211_scan(wiphy, ndev, request, NULL);
Index: wl-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/wl-kmod/F-17/wl-kmod.spec,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- wl-kmod.spec 11 Oct 2012 06:52:22 -0000 1.91
+++ wl-kmod.spec 16 Oct 2012 19:13:24 -0000 1.92
@@ -7,7 +7,7 @@
Name: wl-kmod
Version: 5.100.82.112
-Release: 4%{?dist}.1
+Release: 5%{?dist}
Summary: Kernel module for Broadcom wireless devices
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -19,6 +19,7 @@
Patch1: broadcom-wl-5.100.82.112-kernel-3.2.patch
Patch2: broadcom-wl-5.100.82.112-kernel-3.4.patch
Patch3: broadcom-wl-5.100.82.112-cfg80211.patch
+Patch4: broadcom-wl-5.100.82.112-kernel-3.6.patch
BuildRequires: %{_bindir}/kmodtool
@@ -58,6 +59,7 @@
%patch1 -p1 -b .kernel-3.2
%patch2 -p1 -b .kernel-3.4
%patch3 -p1 -b .cfg80211
+%patch4 -p1 -b .kernel-3.6
popd
for kernel_version in %{?kernel_versions} ; do
@@ -87,6 +89,9 @@
rm -rf $RPM_BUILD_ROOT
%changelog
+* Tue Oct 16 2012 Nicolas Vieville <nicolas.vieville(a)univ-valenciennes.fr> - 5.100.82.112-5
+- Added patch to build for kernel >= 3.6
+
* Thu Oct 11 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 5.100.82.112-4.1
- Rebuilt for updated kernel
11 years, 11 months
rpms/wl-kmod/F-18 broadcom-wl-5.100.82.112-kernel-3.6.patch, NONE, 1.1 wl-kmod.spec, 1.65, 1.66
by Nicolas Viéville
Author: nvieville
Update of /cvs/nonfree/rpms/wl-kmod/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv31748
Modified Files:
wl-kmod.spec
Added Files:
broadcom-wl-5.100.82.112-kernel-3.6.patch
Log Message:
* Tue Oct 16 2012 Nicolas Vieville <nicolas.vieville(a)univ-valenciennes.fr> - 5.100.82.112-5
- Added patch to build for kernel >= 3.6
broadcom-wl-5.100.82.112-kernel-3.6.patch:
wl_cfg80211.c | 10 ++++++++++
1 file changed, 10 insertions(+)
--- NEW FILE broadcom-wl-5.100.82.112-kernel-3.6.patch ---
diff -Naur hybrid-portsrc_x86_32-v5_100_82_112.orig/src/wl/sys/wl_cfg80211.c hybrid-portsrc_x86_32-v5_100_82_112/src/wl/sys/wl_cfg80211.c
--- hybrid-portsrc_x86_32-v5_100_82_112.orig/src/wl/sys/wl_cfg80211.c 2011-10-22 18:56:55.000000000 +0200
+++ hybrid-portsrc_x86_32-v5_100_82_112/src/wl/sys/wl_cfg80211.c 2012-10-16 14:30:42.882619819 +0200
@@ -42,7 +42,11 @@
enum nl80211_iftype type, u32 *flags, struct vif_params *params);
static s32 __wl_cfg80211_scan(struct wiphy *wiphy, struct net_device *ndev,
struct cfg80211_scan_request *request, struct cfg80211_ssid *this_ssid);
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0)
+static s32 wl_cfg80211_scan(struct wiphy *wiphy,
+#else
static s32 wl_cfg80211_scan(struct wiphy *wiphy, struct net_device *ndev,
+#endif
struct cfg80211_scan_request *request);
static s32 wl_cfg80211_set_wiphy_params(struct wiphy *wiphy, u32 changed);
static s32 wl_cfg80211_join_ibss(struct wiphy *wiphy, struct net_device *dev,
@@ -570,10 +574,16 @@
}
static s32
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0)
+wl_cfg80211_scan(struct wiphy *wiphy,
+#else
wl_cfg80211_scan(struct wiphy *wiphy, struct net_device *ndev,
+#endif
struct cfg80211_scan_request *request)
{
s32 err = 0;
+ struct wl_priv *wl = wiphy_to_wl(wiphy);
+ struct net_device *ndev = wl_to_ndev(wl);
CHECK_SYS_UP();
err = __wl_cfg80211_scan(wiphy, ndev, request, NULL);
Index: wl-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/wl-kmod/F-18/wl-kmod.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- wl-kmod.spec 10 Oct 2012 17:13:23 -0000 1.65
+++ wl-kmod.spec 16 Oct 2012 18:56:29 -0000 1.66
@@ -7,7 +7,7 @@
Name: wl-kmod
Version: 5.100.82.112
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Kernel module for Broadcom wireless devices
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -19,6 +19,7 @@
Patch1: broadcom-wl-5.100.82.112-kernel-3.2.patch
Patch2: broadcom-wl-5.100.82.112-kernel-3.4.patch
Patch3: broadcom-wl-5.100.82.112-cfg80211.patch
+Patch4: broadcom-wl-5.100.82.112-kernel-3.6.patch
BuildRequires: %{_bindir}/kmodtool
@@ -58,6 +59,7 @@
%patch1 -p1 -b .kernel-3.2
%patch2 -p1 -b .kernel-3.4
%patch3 -p1 -b .cfg80211
+%patch4 -p1 -b .kernel-3.6
popd
for kernel_version in %{?kernel_versions} ; do
@@ -87,6 +89,9 @@
rm -rf $RPM_BUILD_ROOT
%changelog
+* Tue Oct 16 2012 Nicolas Vieville <nicolas.vieville(a)univ-valenciennes.fr> - 5.100.82.112-5
+- Added patch to build for kernel >= 3.6
+
* Wed Oct 10 2012 Nicolas Vieville <nicolas.vieville(a)univ-valenciennes.fr> - 5.100.82.112-4
- Added patch to build with CFG80211 API as default for F-17
11 years, 11 months
rpms/wl-kmod/devel broadcom-wl-5.100.82.112-kernel-3.6.patch, NONE, 1.1 wl-kmod.spec, 1.67, 1.68
by Nicolas Viéville
Author: nvieville
Update of /cvs/nonfree/rpms/wl-kmod/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv31537
Modified Files:
wl-kmod.spec
Added Files:
broadcom-wl-5.100.82.112-kernel-3.6.patch
Log Message:
* Tue Oct 16 2012 Nicolas Vieville <nicolas.vieville(a)univ-valenciennes.fr> - 5.100.82.112-5
- Added patch to build for kernel >= 3.6
broadcom-wl-5.100.82.112-kernel-3.6.patch:
wl_cfg80211.c | 10 ++++++++++
1 file changed, 10 insertions(+)
--- NEW FILE broadcom-wl-5.100.82.112-kernel-3.6.patch ---
diff -Naur hybrid-portsrc_x86_32-v5_100_82_112.orig/src/wl/sys/wl_cfg80211.c hybrid-portsrc_x86_32-v5_100_82_112/src/wl/sys/wl_cfg80211.c
--- hybrid-portsrc_x86_32-v5_100_82_112.orig/src/wl/sys/wl_cfg80211.c 2011-10-22 18:56:55.000000000 +0200
+++ hybrid-portsrc_x86_32-v5_100_82_112/src/wl/sys/wl_cfg80211.c 2012-10-16 14:30:42.882619819 +0200
@@ -42,7 +42,11 @@
enum nl80211_iftype type, u32 *flags, struct vif_params *params);
static s32 __wl_cfg80211_scan(struct wiphy *wiphy, struct net_device *ndev,
struct cfg80211_scan_request *request, struct cfg80211_ssid *this_ssid);
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0)
+static s32 wl_cfg80211_scan(struct wiphy *wiphy,
+#else
static s32 wl_cfg80211_scan(struct wiphy *wiphy, struct net_device *ndev,
+#endif
struct cfg80211_scan_request *request);
static s32 wl_cfg80211_set_wiphy_params(struct wiphy *wiphy, u32 changed);
static s32 wl_cfg80211_join_ibss(struct wiphy *wiphy, struct net_device *dev,
@@ -570,10 +574,16 @@
}
static s32
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0)
+wl_cfg80211_scan(struct wiphy *wiphy,
+#else
wl_cfg80211_scan(struct wiphy *wiphy, struct net_device *ndev,
+#endif
struct cfg80211_scan_request *request)
{
s32 err = 0;
+ struct wl_priv *wl = wiphy_to_wl(wiphy);
+ struct net_device *ndev = wl_to_ndev(wl);
CHECK_SYS_UP();
err = __wl_cfg80211_scan(wiphy, ndev, request, NULL);
Index: wl-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/wl-kmod/devel/wl-kmod.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- wl-kmod.spec 10 Oct 2012 18:00:48 -0000 1.67
+++ wl-kmod.spec 16 Oct 2012 18:54:01 -0000 1.68
@@ -7,7 +7,7 @@
Name: wl-kmod
Version: 5.100.82.112
-Release: 4%{?dist}.1
+Release: 5%{?dist}
Summary: Kernel module for Broadcom wireless devices
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -19,6 +19,7 @@
Patch1: broadcom-wl-5.100.82.112-kernel-3.2.patch
Patch2: broadcom-wl-5.100.82.112-kernel-3.4.patch
Patch3: broadcom-wl-5.100.82.112-cfg80211.patch
+Patch4: broadcom-wl-5.100.82.112-kernel-3.6.patch
BuildRequires: %{_bindir}/kmodtool
@@ -58,6 +59,7 @@
%patch1 -p1 -b .kernel-3.2
%patch2 -p1 -b .kernel-3.4
%patch3 -p1 -b .cfg80211
+%patch4 -p1 -b .kernel-3.6
popd
for kernel_version in %{?kernel_versions} ; do
@@ -87,6 +89,9 @@
rm -rf $RPM_BUILD_ROOT
%changelog
+* Tue Oct 16 2012 Nicolas Vieville <nicolas.vieville(a)univ-valenciennes.fr> - 5.100.82.112-5
+- Added patch to build for kernel >= 3.6
+
* Wed Oct 10 2012 Nicolas Vieville <nicolas.vieville(a)univ-valenciennes.fr> - 5.100.82.112-4.1
- Added patch to build with CFG80211 API as default for F-17
11 years, 11 months