rpms/gnome-mplayer/F-11 .cvsignore, 1.12, 1.13 gnome-mplayer.spec, 1.22, 1.23 sources, 1.12, 1.13
by Julian Sikorski
Author: belegdol
Update of /cvs/free/rpms/gnome-mplayer/F-11
In directory se02.es.rpmfusion.net:/tmp/cvs-serv19808
Modified Files:
.cvsignore gnome-mplayer.spec sources
Log Message:
* Sat Sep 19 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.9.8-1
- Updated to 0.9.8
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/gnome-mplayer/F-11/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore 21 Aug 2009 18:38:26 -0000 1.12
+++ .cvsignore 19 Sep 2009 19:08:45 -0000 1.13
@@ -1 +1 @@
-gnome-mplayer-0.9.7.tar.gz
+gnome-mplayer-0.9.8.tar.gz
Index: gnome-mplayer.spec
===================================================================
RCS file: /cvs/free/rpms/gnome-mplayer/F-11/gnome-mplayer.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- gnome-mplayer.spec 21 Aug 2009 19:28:11 -0000 1.22
+++ gnome-mplayer.spec 19 Sep 2009 19:08:45 -0000 1.23
@@ -1,5 +1,5 @@
Name: gnome-mplayer
-Version: 0.9.7
+Version: 0.9.8
Release: 1%{?dist}
Summary: An MPlayer GUI, a full-featured binary
@@ -204,6 +204,9 @@
%changelog
+* Sat Sep 19 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.9.8-1
+- Updated to 0.9.8
+
* Fri Aug 21 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.9.7-1
- Updated to 0.9.7
- Dropped upstreamed patches
Index: sources
===================================================================
RCS file: /cvs/free/rpms/gnome-mplayer/F-11/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources 21 Aug 2009 18:38:26 -0000 1.12
+++ sources 19 Sep 2009 19:08:45 -0000 1.13
@@ -1 +1 @@
-09887967c1f853155df65732436120c6 gnome-mplayer-0.9.7.tar.gz
+540630654db044198c435f32c04b1b53 gnome-mplayer-0.9.8.tar.gz
14 years, 7 months
rpms/gnome-mplayer/devel .cvsignore, 1.12, 1.13 gnome-mplayer.spec, 1.23, 1.24 sources, 1.12, 1.13
by Julian Sikorski
Author: belegdol
Update of /cvs/free/rpms/gnome-mplayer/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv19679
Modified Files:
.cvsignore gnome-mplayer.spec sources
Log Message:
* Sat Sep 19 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.9.8-1
- Updated to 0.9.8
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/gnome-mplayer/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore 21 Aug 2009 18:38:17 -0000 1.12
+++ .cvsignore 19 Sep 2009 19:08:37 -0000 1.13
@@ -1 +1 @@
-gnome-mplayer-0.9.7.tar.gz
+gnome-mplayer-0.9.8.tar.gz
Index: gnome-mplayer.spec
===================================================================
RCS file: /cvs/free/rpms/gnome-mplayer/devel/gnome-mplayer.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- gnome-mplayer.spec 21 Aug 2009 19:28:06 -0000 1.23
+++ gnome-mplayer.spec 19 Sep 2009 19:08:37 -0000 1.24
@@ -1,5 +1,5 @@
Name: gnome-mplayer
-Version: 0.9.7
+Version: 0.9.8
Release: 1%{?dist}
Summary: An MPlayer GUI, a full-featured binary
@@ -204,6 +204,9 @@
%changelog
+* Sat Sep 19 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.9.8-1
+- Updated to 0.9.8
+
* Fri Aug 21 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.9.7-1
- Updated to 0.9.7
- Dropped upstreamed patches
Index: sources
===================================================================
RCS file: /cvs/free/rpms/gnome-mplayer/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources 21 Aug 2009 18:38:17 -0000 1.12
+++ sources 19 Sep 2009 19:08:37 -0000 1.13
@@ -1 +1 @@
-09887967c1f853155df65732436120c6 gnome-mplayer-0.9.7.tar.gz
+540630654db044198c435f32c04b1b53 gnome-mplayer-0.9.8.tar.gz
14 years, 7 months
rpms/wl-kmod/devel broadcom-wl-5.10.91.9.3-license.patch, 1.1, 1.2 wl-kmod.spec, 1.40, 1.41
by Chris Nolan
Author: cnolan
Update of /cvs/nonfree/rpms/wl-kmod/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv24171
Modified Files:
broadcom-wl-5.10.91.9.3-license.patch wl-kmod.spec
Log Message:
* Sat Sep 19 2009 Chris Nolan <chris(a)cenolan.com> - 5.10.91.9.3-3
- fixed licence patch
broadcom-wl-5.10.91.9.3-license.patch:
Index: broadcom-wl-5.10.91.9.3-license.patch
===================================================================
RCS file: /cvs/nonfree/rpms/wl-kmod/devel/broadcom-wl-5.10.91.9.3-license.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- broadcom-wl-5.10.91.9.3-license.patch 19 Sep 2009 12:58:08 -0000 1.1
+++ broadcom-wl-5.10.91.9.3-license.patch 19 Sep 2009 13:12:54 -0000 1.2
@@ -1,11 +1,12 @@
-diff -Nru a/wl_linux.c b/wl_linux.c
---- a/wl_linux.c 2009-05-02 08:03:54.000000000 +0400
-+++ b/wl_linux.c 2009-05-02 08:05:36.000000000 +0400
-@@ -190,6 +190,7 @@
- { 0 }
- };
- MODULE_DEVICE_TABLE(pci, wl_id_table);
-+MODULE_LICENSE("Mixed/Proprietary");
+diff -Naur hybrid-portsrc-x86_32-v5.10.91.9.3.orig/src/wl/sys/wl_linux.c hybrid-portsrc-x86_32-v5.10.91.9.3/src/wl/sys/wl_linux.c
+--- hybrid-portsrc-x86_32-v5.10.91.9.3.orig/src/wl/sys/wl_linux.c 2009-09-10 19:21:58.000000000 +0100
++++ hybrid-portsrc-x86_32-v5.10.91.9.3/src/wl/sys/wl_linux.c 2009-09-19 14:10:00.470676797 +0100
+@@ -171,6 +171,8 @@
+ static void my_force_kill(wl_task_t *task);
+ #endif
- #ifdef BCMDBG
- static int msglevel = 0xdeadbeef;
++MODULE_LICENSE("MIXED/Proprietary");
++
+ static struct pci_device_id wl_id_table[] = {
+ { PCI_VENDOR_ID_BROADCOM, 0x4311, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
+ { PCI_VENDOR_ID_BROADCOM, 0x4312, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
Index: wl-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/wl-kmod/devel/wl-kmod.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- wl-kmod.spec 19 Sep 2009 12:58:08 -0000 1.40
+++ wl-kmod.spec 19 Sep 2009 13:12:54 -0000 1.41
@@ -7,7 +7,7 @@
Name: wl-kmod
Version: 5.10.91.9.3
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Kernel module for broadcom wireless devices
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -82,6 +82,9 @@
rm -rf $RPM_BUILD_ROOT
%changelog
+* Sat Sep 19 2009 Chris Nolan <chris(a)cenolan.com> - 5.10.91.9.3-3
+- fixed licence patch
+
* Sat Sep 19 2009 Chris Nolan <chris(a)cenolan.com> - 5.10.91.9.3-2
- new licence patch
14 years, 7 months
rpms/live555/F-11 live.2009.03.22-unified.patch,1.1,1.2
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/live555/F-11
In directory se02.es.rpmfusion.net:/tmp/cvs-serv23638
Modified Files:
live.2009.03.22-unified.patch
Log Message:
Fix
live.2009.03.22-unified.patch:
Index: live.2009.03.22-unified.patch
===================================================================
RCS file: /cvs/free/rpms/live555/F-11/live.2009.03.22-unified.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- live.2009.03.22-unified.patch 17 Apr 2009 11:58:46 -0000 1.1
+++ live.2009.03.22-unified.patch 19 Sep 2009 13:04:58 -0000 1.2
@@ -3,7 +3,7 @@
+++ live-patches/config.linux 2009-03-24 14:10:56.000000000 +0100
@@ -1,4 +1,4 @@
-COMPILE_OPTS = $(INCLUDES) -I. -O2 -DSOCKLEN_T=socklen_t -D_LARGEFILE_SOURCE=1 -D_FILE_OFFSET_BITS=64
-+COMPILE_OPTS = $(INCLUDES) -I. $(CFLAGS) -DBSD=1 -DSOCKLEN_T=socklen_t -D_LARGEFILE_SOURCE=1 -D_FILE_OFFSET_BITS=64
++COMPILE_OPTS = $(INCLUDES) -I. $(CFLAGS) -DSOCKLEN_T=socklen_t -D_LARGEFILE_SOURCE=1 -D_FILE_OFFSET_BITS=64
C = c
C_COMPILER = cc
C_FLAGS = $(COMPILE_OPTS)
@@ -14,7 +14,7 @@
-LIBRARY_LINK = ld -o
-LIBRARY_LINK_OPTS = $(LINK_OPTS) -r -Bstatic
-LIB_SUFFIX = a
-+LIBRARY_LINK = $(CC) -o
++LIBRARY_LINK = c++ -o
+LIBRARY_LINK_OPTS = $(LINK_OPTS) -shared -Wl,-soname,$@.$(SO_VERSION) $(LIBADDS)
+LIB_SUFFIX = so
LIBS_FOR_CONSOLE_APPLICATION =
@@ -30,7 +30,7 @@
+C_FLAGS = $(COMPILE_OPTS)
+CPP = cpp
+CPLUSPLUS_COMPILER = c++
-+CPLUSPLUS_FLAGS = $(COMPILE_OPTS) -Wall -DBSD=1
++CPLUSPLUS_FLAGS = $(COMPILE_OPTS) -Wall
+OBJ = o
+LINK = c++ -o
+LINK_OPTS = -L.
14 years, 7 months
rpms/live555/F-11 live555.spec,1.5,1.6 sources,1.5,1.6
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/live555/F-11
In directory se02.es.rpmfusion.net:/tmp/cvs-serv23285
Modified Files:
live555.spec sources
Log Message:
- 2009.07.28
- Revert circle dependency (prefer undefined non_weak_symbol)
- Disable static libraries compiled with fpic.
- Use c++ to link - BZ #564
Index: live555.spec
===================================================================
RCS file: /cvs/free/rpms/live555/F-11/live555.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- live555.spec 17 Apr 2009 11:58:46 -0000 1.5
+++ live555.spec 19 Sep 2009 13:03:38 -0000 1.6
@@ -1,9 +1,9 @@
-%define date 2009.04.07
+%define date 2009.07.28
%define live_soversion 0
Name: live555
Version: 0
-Release: 0.23.%{date}%{?dist}
+Release: 0.24.%{date}%{?dist}
Summary: Live555.com streaming libraries
Group: System Environment/Libraries
@@ -82,41 +82,13 @@
%build
./genMakefiles %{_target_os}.static
-make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS -fPIC -DPIC"
-rename .a _pic.a */*.a
-mv $(find BasicUsageEnvironment groupsock liveMedia UsageEnvironment -name "*.a" ) $(pwd)
-make clean
make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"
mv $(find BasicUsageEnvironment groupsock liveMedia UsageEnvironment -name "*.a" ) $(pwd)
make clean
-# Hack to prevent undefined-non-weak-symbol
-for i in groupsock liveMedia ; do
- pushd $i
- LIBADD="-lstdc++ -lpthread"
- for j in BasicUsageEnvironment groupsock liveMedia UsageEnvironment ; do
- if [ $(grep $j Makefile.head |wc -l) = 1 ] ; then
- LIBADD="$LIBADD -L../${j} -l${j}"
- fi
- done
- echo -e LIBADDS = " $LIBADD " >> Makefile.head
- popd
- pushd UsageEnvironment
- echo -e LIBADDS = -lstdc++ -L../BasicUsageEnvironment -lBasicUsageEnvironment >> Makefile.head
- popd
- pushd BasicUsageEnvironment
- echo -e LIBADDS = -lstdc++ -lpthread >> Makefile.head
- popd
-done
+
./genMakefiles %{_target_os}
make CFLAGS="$RPM_OPT_FLAGS -fPIC -DPIC" SO_VERSION="%{live_soversion}"
-# Hack to fix the circle dependency - we leave the safe parallele work here.
-pushd BasicUsageEnvironment
-rm *.so
-make CFLAGS="$RPM_OPT_FLAGS -fPIC -DPIC" SO_VERSION="%{live_soversion}" \
- LIBADDS="-lstdc++ -lpthread -L../UsageEnvironment -lUsageEnvironment"
-popd
-
%install
rm -rf $RPM_BUILD_ROOT
install -dm 755 $RPM_BUILD_ROOT{%{_libdir},%{_bindir}}
@@ -124,7 +96,6 @@
install -dm 755 $RPM_BUILD_ROOT%{_includedir}/$i
install -pm 644 $i/include/*.h* $RPM_BUILD_ROOT%{_includedir}/$i/
install -pm 644 lib${i}.a $RPM_BUILD_ROOT%{_libdir}/lib${i}.a
- install -pm 644 lib${i}_pic.a $RPM_BUILD_ROOT%{_libdir}/lib${i}_pic.a
install -pm 755 $i/lib${i}.so $RPM_BUILD_ROOT%{_libdir}/lib${i}.so.%{date}
ln -sf lib${i}.so.%{date} $RPM_BUILD_ROOT%{_libdir}/lib${i}.so.%{live_soversion}
ln -sf lib${i}.so.%{date} $RPM_BUILD_ROOT%{_libdir}/lib${i}.so
@@ -198,6 +169,12 @@
%{_libdir}/libUsageEnvironment*.a
%changelog
+* Mon Aug 17 2009 kwizart < kwizart at gmail.com > - 0-0.24.2009.07.28
+- 2009.07.28
+- Revert circle dependency (prefer undefined non_weak_symbol)
+- Disable static libraries compiled with fpic.
+- Use c++ to link - BZ #564
+
* Fri Apr 17 2009 kwizart < kwizart at gmail.com > - 0-0.23.2009.04.07
- Unified patches. (unrelevant fixes dropped).
Index: sources
===================================================================
RCS file: /cvs/free/rpms/live555/F-11/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources 17 Apr 2009 11:58:46 -0000 1.5
+++ sources 19 Sep 2009 13:03:38 -0000 1.6
@@ -1 +1 @@
-724d6779ae6363545d9e83808e5cec2e live.2009.04.07.tar.gz
+f2a9c1067e97076492b324c185bda108 live.2009.07.28.tar.gz
14 years, 7 months
rpms/wl-kmod/devel broadcom-wl-5.10.91.9.3-license.patch, NONE, 1.1 wl-kmod.spec, 1.39, 1.40 broadcom-wl-5.10.91.9-license.patch, 1.1, NONE
by Chris Nolan
Author: cnolan
Update of /cvs/nonfree/rpms/wl-kmod/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv22831
Modified Files:
wl-kmod.spec
Added Files:
broadcom-wl-5.10.91.9.3-license.patch
Removed Files:
broadcom-wl-5.10.91.9-license.patch
Log Message:
* Sat Sep 19 2009 Chris Nolan <chris(a)cenolan.com> - 5.10.91.9.3-2
- new licence patch
broadcom-wl-5.10.91.9.3-license.patch:
--- NEW FILE broadcom-wl-5.10.91.9.3-license.patch ---
diff -Nru a/wl_linux.c b/wl_linux.c
--- a/wl_linux.c 2009-05-02 08:03:54.000000000 +0400
+++ b/wl_linux.c 2009-05-02 08:05:36.000000000 +0400
@@ -190,6 +190,7 @@
{ 0 }
};
MODULE_DEVICE_TABLE(pci, wl_id_table);
+MODULE_LICENSE("Mixed/Proprietary");
#ifdef BCMDBG
static int msglevel = 0xdeadbeef;
Index: wl-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/wl-kmod/devel/wl-kmod.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- wl-kmod.spec 19 Sep 2009 12:46:12 -0000 1.39
+++ wl-kmod.spec 19 Sep 2009 12:58:08 -0000 1.40
@@ -7,7 +7,7 @@
Name: wl-kmod
Version: 5.10.91.9.3
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Kernel module for broadcom wireless devices
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -15,7 +15,7 @@
Source0: http://www.broadcom.com/docs/linux_sta/hybrid-portsrc-x86_32-v5.10.91.9.3...
Source1: http://www.broadcom.com/docs/linux_sta/hybrid-portsrc-x86_64-v5.10.91.9.3...
Source11: broadcom-wl-kmodtool-excludekernel-filterfile
-Patch0: broadcom-wl-5.10.91.9-license.patch
+Patch0: broadcom-wl-5.10.91.9.3-license.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: %{_bindir}/kmodtool
@@ -82,6 +82,9 @@
rm -rf $RPM_BUILD_ROOT
%changelog
+* Sat Sep 19 2009 Chris Nolan <chris(a)cenolan.com> - 5.10.91.9.3-2
+- new licence patch
+
* Sat Sep 19 2009 Chris Nolan <chris(a)cenolan.com> - 5.10.91.9.3-1
- updated to 5.10.91.9.3
--- broadcom-wl-5.10.91.9-license.patch DELETED ---
14 years, 7 months
rpms/xmltv/devel .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 xmltv.spec, 1.6, 1.7
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/xmltv/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv22677
Modified Files:
.cvsignore sources xmltv.spec
Log Message:
Update to 0.5.56
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/xmltv/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore 20 Mar 2009 14:39:09 -0000 1.4
+++ .cvsignore 19 Sep 2009 12:56:09 -0000 1.5
@@ -1 +1 @@
-xmltv-0.5.55.tar.bz2
+xmltv-0.5.56.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/xmltv/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 20 Mar 2009 14:39:09 -0000 1.4
+++ sources 19 Sep 2009 12:56:09 -0000 1.5
@@ -1 +1 @@
-21812833b083a8e830ee1837e4060199 xmltv-0.5.55.tar.bz2
+308c01dc50f9f138bd9ada7483e2877b xmltv-0.5.56.tar.bz2
Index: xmltv.spec
===================================================================
RCS file: /cvs/free/rpms/xmltv/devel/xmltv.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xmltv.spec 29 Mar 2009 14:25:28 -0000 1.6
+++ xmltv.spec 19 Sep 2009 12:56:09 -0000 1.7
@@ -1,6 +1,6 @@
Name: xmltv
-Version: 0.5.55
-Release: 2%{?dist}
+Version: 0.5.56
+Release: 1%{?dist}
Summary: A set of utilities to manage your TV viewing
Group: Development/Libraries
@@ -208,6 +208,9 @@
%changelog
+* Sat Sep 19 2009 kwizart < kwizart at gmail.com > - 0.5.56-1
+- Update to 0.5.56
+
* Sun Mar 29 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 0.5.55-2
- rebuild for new F11 features
14 years, 7 months
rpms/broadcom-wl/devel broadcom-wl-blacklist.conf, NONE, 1.1 .cvsignore, 1.6, 1.7 broadcom-wl.spec, 1.7, 1.8 sources, 1.6, 1.7 broadcom-wl-blacklist, 1.1, NONE
by Chris Nolan
Author: cnolan
Update of /cvs/nonfree/rpms/broadcom-wl/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv22261
Modified Files:
.cvsignore broadcom-wl.spec sources
Added Files:
broadcom-wl-blacklist.conf
Removed Files:
broadcom-wl-blacklist
Log Message:
* Sat Sep 19 2009 Chris Nolan <chris(a)cenolan.com> - 5.10.91.9.3
- updated to 5.10.91.9.3
--- NEW FILE broadcom-wl-blacklist.conf ---
# modules blacklisted for broadcom-wl
blacklist bcm43xx
blacklist ssb
blacklist b43
blacklist ndiswrapper
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/broadcom-wl/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore 8 Mar 2009 20:40:25 -0000 1.6
+++ .cvsignore 19 Sep 2009 12:52:18 -0000 1.7
@@ -1 +1 @@
-hybrid-portsrc-x86_32-v5_10_79_10.tar.gz
+hybrid-portsrc-x86_32-v5.10.91.9.3.tar.gz
Index: broadcom-wl.spec
===================================================================
RCS file: /cvs/nonfree/rpms/broadcom-wl/devel/broadcom-wl.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- broadcom-wl.spec 29 Mar 2009 14:46:27 -0000 1.7
+++ broadcom-wl.spec 19 Sep 2009 12:52:18 -0000 1.8
@@ -1,13 +1,13 @@
Name: broadcom-wl
-Version: 5.10.79.10
-Release: 2%{?dist}
+Version: 5.10.91.9.3
+Release: 1%{?dist}
Summary: Common files for Broadcom 802.11 STA driver
Group: System Environment/Kernel
License: Redistributable, no modification permitted
URL: http://www.broadcom.com/support/802.11/linux_sta.php
-Source0: http://www.broadcom.com/docs/linux_sta/hybrid-portsrc-x86_32-v5_10_79_10....
+Source0: http://www.broadcom.com/docs/linux_sta/hybrid-portsrc-x86_32-v5.10.91.9.3...
Source1: http://www.broadcom.com/docs/linux_sta/README.txt
-Source2: broadcom-wl-blacklist
+Source2: broadcom-wl-blacklist.conf
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -43,9 +43,12 @@
%files
%defattr(-,root,root,-)
%doc lib/LICENSE.txt README.txt
-%config(noreplace) %{_sysconfdir}/modprobe.d/broadcom-wl-blacklist
+%config(noreplace) %{_sysconfdir}/modprobe.d/broadcom-wl-blacklist.conf
%changelog
+* Sat Sep 19 2009 Chris Nolan <chris(a)cenolan.com> - 5.10.91.9.3
+- updated to 5.10.91.9.3
+
* Sun Mar 29 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 5.10.79.10-2
- rebuild for new F11 features
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/broadcom-wl/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources 8 Mar 2009 20:40:25 -0000 1.6
+++ sources 19 Sep 2009 12:52:18 -0000 1.7
@@ -1 +1 @@
-7dd0b216ce8b9b4289425e6a71628232 hybrid-portsrc-x86_32-v5_10_79_10.tar.gz
+15890e1f9afe844adf2e251d390e28ac hybrid-portsrc-x86_32-v5.10.91.9.3.tar.gz
--- broadcom-wl-blacklist DELETED ---
14 years, 7 months
rpms/wl-kmod/devel .cvsignore, 1.7, 1.8 sources, 1.7, 1.8 wl-kmod.spec, 1.38, 1.39 broadcom-wl-5.10.91.9-linux-2.6.29.patch, 1.1, NONE broadcom-wl-5.10.91.9-linux-2.6.30.patch, 1.1, NONE
by Chris Nolan
Author: cnolan
Update of /cvs/nonfree/rpms/wl-kmod/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv21754
Modified Files:
.cvsignore sources wl-kmod.spec
Removed Files:
broadcom-wl-5.10.91.9-linux-2.6.29.patch
broadcom-wl-5.10.91.9-linux-2.6.30.patch
Log Message:
* Sat Sep 19 2009 Chris Nolan <chris(a)cenolan.com> - 5.10.91.9.3-1
- updated to 5.10.91.9.3
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/wl-kmod/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore 19 Sep 2009 12:24:55 -0000 1.7
+++ .cvsignore 19 Sep 2009 12:46:12 -0000 1.8
@@ -1,2 +1,2 @@
-hybrid-portsrc-x86_32-v5_10_91_9.tar.gz
-hybrid-portsrc-x86_64-v5_10_91_9.tar.gz
+hybrid-portsrc-x86_32-v5.10.91.9.3.tar.gz
+hybrid-portsrc-x86_64-v5.10.91.9.3.tar.gz
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/wl-kmod/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources 19 Sep 2009 12:24:55 -0000 1.7
+++ sources 19 Sep 2009 12:46:12 -0000 1.8
@@ -1,2 +1,2 @@
-8c538fedcc48df17668bd2b4ee424549 hybrid-portsrc-x86_32-v5_10_91_9.tar.gz
-39ad099c6d2b1617bbad37f7f44e57bc hybrid-portsrc-x86_64-v5_10_91_9.tar.gz
+15890e1f9afe844adf2e251d390e28ac hybrid-portsrc-x86_32-v5.10.91.9.3.tar.gz
+ed255d2c98690ef76757d95b2d9e6b32 hybrid-portsrc-x86_64-v5.10.91.9.3.tar.gz
Index: wl-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/wl-kmod/devel/wl-kmod.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- wl-kmod.spec 19 Sep 2009 12:24:55 -0000 1.38
+++ wl-kmod.spec 19 Sep 2009 12:46:12 -0000 1.39
@@ -6,18 +6,16 @@
#define buildforkernels newest
Name: wl-kmod
-Version: 5.10.91.9
+Version: 5.10.91.9.3
Release: 1%{?dist}
Summary: Kernel module for broadcom wireless devices
Group: System Environment/Kernel
License: Redistributable, no modification permitted
URL: http://www.broadcom.com/support/802.11/linux_sta.php
-Source0: http://www.broadcom.com/docs/linux_sta/hybrid-portsrc-x86_32-v5_10_91_9.t...
-Source1: http://www.broadcom.com/docs/linux_sta/hybrid-portsrc-x86_64-v5_10_91_9.t...
+Source0: http://www.broadcom.com/docs/linux_sta/hybrid-portsrc-x86_32-v5.10.91.9.3...
+Source1: http://www.broadcom.com/docs/linux_sta/hybrid-portsrc-x86_64-v5.10.91.9.3...
Source11: broadcom-wl-kmodtool-excludekernel-filterfile
-Patch0: broadcom-wl-5.10.91.9-linux-2.6.29.patch
-Patch1: broadcom-wl-5.10.91.9-license.patch
-Patch2: broadcom-wl-5.10.91.9-linux-2.6.30.patch
+Patch0: broadcom-wl-5.10.91.9-license.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: %{_bindir}/kmodtool
@@ -54,9 +52,7 @@
%else
tar xzf %{SOURCE1}
%endif
-%patch0 -p1 -b .kernelfix
-%patch1 -p1 -b .license
-%patch2 -p1 -b .kernel30fix
+%patch0 -p1 -b .license
popd
for kernel_version in %{?kernel_versions} ; do
@@ -86,6 +82,9 @@
rm -rf $RPM_BUILD_ROOT
%changelog
+* Sat Sep 19 2009 Chris Nolan <chris(a)cenolan.com> - 5.10.91.9.3-1
+- updated to 5.10.91.9.3
+
* Sat Sep 19 2009 Chris Nolan <chris(a)cenolan.com> - 5.10.91.9-1
- updated to 5.10.91.9
--- broadcom-wl-5.10.91.9-linux-2.6.29.patch DELETED ---
--- broadcom-wl-5.10.91.9-linux-2.6.30.patch DELETED ---
14 years, 7 months
rpms/wl-kmod/devel broadcom-wl-5.10.91.9-license.patch, NONE, 1.1 broadcom-wl-5.10.91.9-linux-2.6.29.patch, NONE, 1.1 broadcom-wl-5.10.91.9-linux-2.6.30.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 sources, 1.6, 1.7 wl-kmod.spec, 1.37, 1.38 broadcom-wl-5.10.79.10-linux-2.6.29.patch, 1.3, NONE
by Chris Nolan
Author: cnolan
Update of /cvs/nonfree/rpms/wl-kmod/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv20427
Modified Files:
.cvsignore sources wl-kmod.spec
Added Files:
broadcom-wl-5.10.91.9-license.patch
broadcom-wl-5.10.91.9-linux-2.6.29.patch
broadcom-wl-5.10.91.9-linux-2.6.30.patch
Removed Files:
broadcom-wl-5.10.79.10-linux-2.6.29.patch
Log Message:
* Sat Sep 19 2009 Chris Nolan <chris(a)cenolan.com> - 5.10.91.9-1
- updated to 5.10.91.9
broadcom-wl-5.10.91.9-license.patch:
--- NEW FILE broadcom-wl-5.10.91.9-license.patch ---
diff -Naur hybrid-portsrc-x86_32-v5_10_91_9.orig/src/wl/sys/wl_linux.c hybrid-portsrc-x86_32-v5_10_91_9/src/wl/sys/wl_linux.c
--- hybrid-portsrc-x86_32-v5_10_91_9.orig/src/wl/sys/wl_linux.c 2009-04-23 02:48:59.000000000 +0900
+++ hybrid-portsrc-x86_32-v5_10_91_9/src/wl/sys/wl_linux.c 2009-05-08 00:48:20.000000000 +0900
@@ -170,6 +170,8 @@
static void wl_free_if(wl_info_t *wl, wl_if_t *wlif);
static void wl_get_driver_info(struct net_device *dev, struct ethtool_drvinfo *info);
+MODULE_LICENSE("MIXED/Proprietary");
+
static struct pci_device_id wl_id_table[] = {
{ PCI_VENDOR_ID_BROADCOM, 0x4311, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
{ PCI_VENDOR_ID_BROADCOM, 0x4312, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
broadcom-wl-5.10.91.9-linux-2.6.29.patch:
--- NEW FILE broadcom-wl-5.10.91.9-linux-2.6.29.patch ---
diff -Naur hybrid-portsrc-x86_32-v5_10_91_9.orig/src/wl/sys/wl_iw.c hybrid-portsrc-x86_32-v5_10_91_9/src/wl/sys/wl_iw.c
--- hybrid-portsrc-x86_32-v5_10_91_9.orig/src/wl/sys/wl_iw.c 2009-04-23 02:46:35.000000000 +0900
+++ hybrid-portsrc-x86_32-v5_10_91_9/src/wl/sys/wl_iw.c 2009-05-08 00:42:45.000000000 +0900
@@ -610,7 +610,11 @@
char *extra
)
{
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
+ wl_iw_t *iw = netdev_priv(dev);
+#else
wl_iw_t *iw = dev->priv;
+#endif
struct sockaddr *addr = (struct sockaddr *) extra;
int i;
@@ -635,7 +639,11 @@
char *extra
)
{
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
+ wl_iw_t *iw = netdev_priv(dev);
+#else
wl_iw_t *iw = dev->priv;
+#endif
struct sockaddr *addr = (struct sockaddr *) extra;
struct iw_quality *qual = (struct iw_quality *) &addr[iw->spy_num];
int i;
@@ -1110,7 +1118,11 @@
char *extra
)
{
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
+ wl_iw_t *iw = netdev_priv(dev);
+#else
wl_iw_t *iw = dev->priv;
+#endif
WL_TRACE(("%s: SIOCSIWNICKN\n", dev->name));
@@ -1134,7 +1146,11 @@
char *extra
)
{
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
+ wl_iw_t *iw = netdev_priv(dev);
+#else
wl_iw_t *iw = dev->priv;
+#endif
WL_TRACE(("%s: SIOCGIWNICKN\n", dev->name));
@@ -1790,7 +1806,11 @@
int paramid;
int paramval;
int val = 0;
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
+ wl_iw_t *iw = netdev_priv(dev);
+#else
wl_iw_t *iw = dev->priv;
+#endif
WL_TRACE(("%s: SIOCSIWAUTH\n", dev->name));
@@ -1921,7 +1941,11 @@
int paramid;
int paramval = 0;
int val;
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
+ wl_iw_t *iw = netdev_priv(dev);
+#else
wl_iw_t *iw = dev->priv;
+#endif
WL_TRACE(("%s: SIOCGIWAUTH\n", dev->name));
diff -Naur hybrid-portsrc-x86_32-v5_10_91_9.orig/src/wl/sys/wl_linux.c hybrid-portsrc-x86_32-v5_10_91_9/src/wl/sys/wl_linux.c
--- hybrid-portsrc-x86_32-v5_10_91_9.orig/src/wl/sys/wl_linux.c 2009-04-23 02:48:59.000000000 +0900
+++ hybrid-portsrc-x86_32-v5_10_91_9/src/wl/sys/wl_linux.c 2009-05-08 00:45:29.000000000 +0900
@@ -53,6 +53,9 @@
#include <linux/pci_ids.h>
#define WLC_MAXBSSCFG 1
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
+#include <net/lib80211.h>
+#endif
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 14)
#include <net/ieee80211.h>
#endif
@@ -130,7 +133,11 @@
u8 rx_hdr[16], tx_hdr[16];
};
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
+#define WL_DEV_IF(dev) ((wl_if_t*)netdev_priv(dev))
+#else
#define WL_DEV_IF(dev) ((wl_if_t*)(dev)->priv)
+#endif
#define WL_INFO(dev) ((wl_info_t*)(WL_DEV_IF(dev)->wl))
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 20)
@@ -282,6 +289,9 @@
dev = wlif->dev;
wl->dev = dev;
wl_if_setup(dev);
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
+ wlif = netdev_priv(dev);
+#endif
dev->base_addr = regs;
@@ -359,10 +369,20 @@
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 14)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
+ wl->tkipmodops = lib80211_get_crypto_ops("TKIP");
+#else
wl->tkipmodops = ieee80211_get_crypto_ops("TKIP");
+#endif
if (wl->tkipmodops == NULL) {
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
+ request_module("lib80211");
+ request_module("lib80211_crypt_tkip");
+ wl->tkipmodops = lib80211_get_crypto_ops("TKIP");
+#else
request_module("ieee80211_crypt_tkip");
wl->tkipmodops = ieee80211_get_crypto_ops("TKIP");
+#endif
}
#endif
#ifdef CONFIG_WIRELESS_EXT
@@ -666,7 +686,11 @@
}
if (wl->monitor) {
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
+ wl_free_if(wl, (wl_if_t *)netdev_priv(wl->monitor));
+#else
wl_free_if(wl, (wl_if_t *)(wl->monitor->priv));
+#endif
wl->monitor = NULL;
}
@@ -833,7 +857,10 @@
strncpy(dev->name, name, IFNAMSIZ);
#else
- dev = alloc_netdev(0, name, ether_setup);
+ dev = alloc_netdev(sizeof(wl_if_t), name, ether_setup);
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
+ wlif = netdev_priv(dev);
+#endif
if (!dev) {
MFREE(wl->osh, wlif, sizeof(wl_if_t));
WL_ERROR(("wl%d: wl_alloc_if: out of memory, alloc_netdev\n",
@@ -847,7 +874,9 @@
wlif->wl = wl;
wlif->wlcif = wlcif;
wlif->subunit = subunit;
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 29)
dev->priv = wlif;
+#endif
if (iftype != WL_IFTYPE_MON && wl->dev && netif_queue_stopped(wl->dev))
netif_stop_queue(dev);
diff -Naur hybrid-portsrc-x86_32-v5_10_91_9.orig/src/wl/sys/wl_linux.h hybrid-portsrc-x86_32-v5_10_91_9/src/wl/sys/wl_linux.h
--- hybrid-portsrc-x86_32-v5_10_91_9.orig/src/wl/sys/wl_linux.h 2009-04-23 02:49:04.000000000 +0900
+++ hybrid-portsrc-x86_32-v5_10_91_9/src/wl/sys/wl_linux.h 2009-05-08 00:42:45.000000000 +0900
@@ -85,10 +85,16 @@
bool resched;
uint32 pci_psstate[16];
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 14)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
+ struct lib80211_crypto_ops *tkipmodops;
+ struct lib80211_tkip_data *tkip_ucast_data;
+ struct lib80211_tkip_data *tkip_bcast_data;
+#else
struct ieee80211_crypto_ops *tkipmodops;
struct ieee80211_tkip_data *tkip_ucast_data;
struct ieee80211_tkip_data *tkip_bcast_data;
#endif
+#endif
uint stats_id;
broadcom-wl-5.10.91.9-linux-2.6.30.patch:
--- NEW FILE broadcom-wl-5.10.91.9-linux-2.6.30.patch ---
diff -Naur hybrid-portsrc-x86_32-v5_10_91_9.orig/src/wl/sys/wl_iw.c hybrid-portsrc-x86_32-v5_10_91_9/src/wl/sys/wl_iw.c
--- hybrid-portsrc-x86_32-v5_10_91_9.orig/src/wl/sys/wl_linux.c 2009-04-23 21:16:26.637443671 +0400
+++ hybrid-portsrc-x86_32-v5_10_91_9.orig/src/wl/sys/wl_linux.c 2009-04-23 21:17:58.842687327 +0400
@@ -56,9 +56,13 @@
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
#include <net/lib80211.h>
#endif
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 30)
+#include <linux/ieee80211.h>
+#else
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 14)
#include <net/ieee80211.h>
#endif
+#endif
#include <asm/system.h>
#include <asm/io.h>
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/wl-kmod/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore 8 Mar 2009 21:06:13 -0000 1.6
+++ .cvsignore 19 Sep 2009 12:24:55 -0000 1.7
@@ -1,2 +1,2 @@
-hybrid-portsrc-x86_32-v5_10_79_10.tar.gz
-hybrid-portsrc-x86_64-v5_10_79_10.tar.gz
+hybrid-portsrc-x86_32-v5_10_91_9.tar.gz
+hybrid-portsrc-x86_64-v5_10_91_9.tar.gz
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/wl-kmod/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources 8 Mar 2009 21:06:13 -0000 1.6
+++ sources 19 Sep 2009 12:24:55 -0000 1.7
@@ -1,2 +1,2 @@
-7dd0b216ce8b9b4289425e6a71628232 hybrid-portsrc-x86_32-v5_10_79_10.tar.gz
-72af629785af3777bc7398f742fb87af hybrid-portsrc-x86_64-v5_10_79_10.tar.gz
+8c538fedcc48df17668bd2b4ee424549 hybrid-portsrc-x86_32-v5_10_91_9.tar.gz
+39ad099c6d2b1617bbad37f7f44e57bc hybrid-portsrc-x86_64-v5_10_91_9.tar.gz
Index: wl-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/wl-kmod/devel/wl-kmod.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- wl-kmod.spec 5 Jun 2009 13:27:57 -0000 1.37
+++ wl-kmod.spec 19 Sep 2009 12:24:55 -0000 1.38
@@ -6,16 +6,18 @@
#define buildforkernels newest
Name: wl-kmod
-Version: 5.10.79.10
-Release: 2%{?dist}.9
+Version: 5.10.91.9
+Release: 1%{?dist}
Summary: Kernel module for broadcom wireless devices
Group: System Environment/Kernel
License: Redistributable, no modification permitted
URL: http://www.broadcom.com/support/802.11/linux_sta.php
-Source0: http://www.broadcom.com/docs/linux_sta/hybrid-portsrc-x86_32-v5_10_79_10....
-Source1: http://www.broadcom.com/docs/linux_sta/hybrid-portsrc-x86_64-v5_10_79_10....
+Source0: http://www.broadcom.com/docs/linux_sta/hybrid-portsrc-x86_32-v5_10_91_9.t...
+Source1: http://www.broadcom.com/docs/linux_sta/hybrid-portsrc-x86_64-v5_10_91_9.t...
Source11: broadcom-wl-kmodtool-excludekernel-filterfile
-Patch0: broadcom-wl-5.10.79.10-linux-2.6.29.patch
+Patch0: broadcom-wl-5.10.91.9-linux-2.6.29.patch
+Patch1: broadcom-wl-5.10.91.9-license.patch
+Patch2: broadcom-wl-5.10.91.9-linux-2.6.30.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: %{_bindir}/kmodtool
@@ -53,6 +55,8 @@
tar xzf %{SOURCE1}
%endif
%patch0 -p1 -b .kernelfix
+%patch1 -p1 -b .license
+%patch2 -p1 -b .kernel30fix
popd
for kernel_version in %{?kernel_versions} ; do
@@ -82,6 +86,9 @@
rm -rf $RPM_BUILD_ROOT
%changelog
+* Sat Sep 19 2009 Chris Nolan <chris(a)cenolan.com> - 5.10.91.9-1
+- updated to 5.10.91.9
+
* Fri Jun 05 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 5.10.79.10-2.9
- rebuild for final F11 kernel
--- broadcom-wl-5.10.79.10-linux-2.6.29.patch DELETED ---
14 years, 7 months