rpms/mate-applet-streamer/F-20 mate-applet-streamer.spec,1.5,1.6
by Wolfgang Ulbrich
Author: raveit65
Update of /cvs/free/rpms/mate-applet-streamer/F-20
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv8028
Modified Files:
mate-applet-streamer.spec
Log Message:
* Wed Jul 09 2014 Wolfgang Ulbrich <chat-to-me(a)raveit.de> - 0.1.0-1
- update to 0.1.0
Index: mate-applet-streamer.spec
===================================================================
RCS file: /cvs/free/rpms/mate-applet-streamer/F-20/mate-applet-streamer.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- mate-applet-streamer.spec 28 Dec 2013 14:29:25 -0000 1.5
+++ mate-applet-streamer.spec 9 Jul 2014 10:14:04 -0000 1.6
@@ -1,11 +1,11 @@
Name: mate-applet-streamer
-Version: 0.0.5
+Version: 0.1.0
Release: 1%{?dist}
Summary: MATE online radio streamer applet
Group: Applications/System
License: GPLv2+
URL: http://www.zavedil.com/online-radio-applet
-Source: http://www.zavedil.com/wp-content/uploads/2013/11/%{name}-%{version}.tar.gz
+Source: http://www.zavedil.com/wp-content/uploads/2014/04/%{name}-%{version}.tar.gz
BuildRequires: libnotify-devel
BuildRequires: gstreamer1-devel
@@ -67,6 +67,9 @@
%changelog
+* Wed Jul 09 2014 Wolfgang Ulbrich <chat-to-me(a)raveit.de> - 0.1.0-1
+- update to 0.1.0
+
* Sat Dec 28 2013 Wolfgang Ulbrich <chat-to-me(a)raveit.de> - 0.0.5-1
- update to 0.0.5
10 years, 4 months
rpms/mate-applet-streamer/F-20 .cvsignore,1.4,1.5 sources,1.4,1.5
by Wolfgang Ulbrich
Author: raveit65
Update of /cvs/free/rpms/mate-applet-streamer/F-20
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv7955
Modified Files:
.cvsignore sources
Log Message:
upload 0.1.0 source
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/mate-applet-streamer/F-20/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore 28 Dec 2013 13:45:27 -0000 1.4
+++ .cvsignore 9 Jul 2014 10:11:56 -0000 1.5
@@ -1 +1 @@
-mate-applet-streamer-0.0.5.tar.gz
+mate-applet-streamer-0.1.0.tar.gz
Index: sources
===================================================================
RCS file: /cvs/free/rpms/mate-applet-streamer/F-20/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 28 Dec 2013 13:45:27 -0000 1.4
+++ sources 9 Jul 2014 10:11:56 -0000 1.5
@@ -1 +1 @@
-c974612d6ef8138c472511dbc6587013 mate-applet-streamer-0.0.5.tar.gz
+e107ed33c8563585f50335f9905330d2 mate-applet-streamer-0.1.0.tar.gz
10 years, 4 months
rpms/mate-applet-streamer/devel mate-applet-streamer.spec,1.6,1.7
by Wolfgang Ulbrich
Author: raveit65
Update of /cvs/free/rpms/mate-applet-streamer/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv7799
Modified Files:
mate-applet-streamer.spec
Log Message:
* Wed Jul 09 2014 Wolfgang Ulbrich <chat-to-me(a)raveit.de> - 0.1.0-2
- fix build
Index: mate-applet-streamer.spec
===================================================================
RCS file: /cvs/free/rpms/mate-applet-streamer/devel/mate-applet-streamer.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- mate-applet-streamer.spec 9 Jul 2014 09:57:05 -0000 1.6
+++ mate-applet-streamer.spec 9 Jul 2014 10:08:45 -0000 1.7
@@ -1,6 +1,6 @@
Name: mate-applet-streamer
Version: 0.1.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: MATE online radio streamer applet
Group: Applications/System
License: GPLv2+
@@ -67,6 +67,9 @@
%changelog
+* Wed Jul 09 2014 Wolfgang Ulbrich <chat-to-me(a)raveit.de> - 0.1.0-2
+- fix build
+
* Wed Jul 09 2014 Wolfgang Ulbrich <chat-to-me(a)raveit.de> - 0.1.0-1
- update to 0.1.0
10 years, 4 months
rpms/mate-applet-streamer/devel .cvsignore,1.4,1.5 sources,1.4,1.5
by Wolfgang Ulbrich
Author: raveit65
Update of /cvs/free/rpms/mate-applet-streamer/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv7617
Modified Files:
.cvsignore sources
Log Message:
upload 0.1.0 source
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/mate-applet-streamer/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore 28 Dec 2013 14:15:35 -0000 1.4
+++ .cvsignore 9 Jul 2014 10:03:59 -0000 1.5
@@ -1 +1 @@
-mate-applet-streamer-0.0.5.tar.gz
+mate-applet-streamer-0.1.0.tar.gz
Index: sources
===================================================================
RCS file: /cvs/free/rpms/mate-applet-streamer/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 28 Dec 2013 14:15:35 -0000 1.4
+++ sources 9 Jul 2014 10:03:59 -0000 1.5
@@ -1 +1 @@
-c974612d6ef8138c472511dbc6587013 mate-applet-streamer-0.0.5.tar.gz
+e107ed33c8563585f50335f9905330d2 mate-applet-streamer-0.1.0.tar.gz
10 years, 4 months
rpms/mate-applet-streamer/devel mate-applet-streamer.spec,1.5,1.6
by Wolfgang Ulbrich
Author: raveit65
Update of /cvs/free/rpms/mate-applet-streamer/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv7418
Modified Files:
mate-applet-streamer.spec
Log Message:
* Wed Jul 09 2014 Wolfgang Ulbrich <chat-to-me(a)raveit.de> - 0.1.0-1
- update to 0.1.0
Index: mate-applet-streamer.spec
===================================================================
RCS file: /cvs/free/rpms/mate-applet-streamer/devel/mate-applet-streamer.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- mate-applet-streamer.spec 28 Dec 2013 14:15:35 -0000 1.5
+++ mate-applet-streamer.spec 9 Jul 2014 09:57:05 -0000 1.6
@@ -1,11 +1,11 @@
Name: mate-applet-streamer
-Version: 0.0.5
+Version: 0.1.0
Release: 1%{?dist}
Summary: MATE online radio streamer applet
Group: Applications/System
License: GPLv2+
URL: http://www.zavedil.com/online-radio-applet
-Source: http://www.zavedil.com/wp-content/uploads/2013/11/%{name}-%{version}.tar.gz
+Source: http://www.zavedil.com/wp-content/uploads/2014/04/%{name}-%{version}.tar.gz
BuildRequires: libnotify-devel
BuildRequires: gstreamer1-devel
@@ -67,6 +67,9 @@
%changelog
+* Wed Jul 09 2014 Wolfgang Ulbrich <chat-to-me(a)raveit.de> - 0.1.0-1
+- update to 0.1.0
+
* Sat Dec 28 2013 Wolfgang Ulbrich <chat-to-me(a)raveit.de> - 0.0.5-1
- update to 0.0.5
10 years, 4 months
rpms/wl-kmod/F-20 wl-kmod-005-2_devinit_late.patch, NONE, 1.1 wl-kmod-005_kernel_3.15.patch, 1.1, 1.2 wl-kmod.spec, 1.110, 1.111
by Nicolas Viéville
Author: nvieville
Update of /cvs/nonfree/rpms/wl-kmod/F-20
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv5526
Modified Files:
wl-kmod-005_kernel_3.15.patch wl-kmod.spec
Added Files:
wl-kmod-005-2_devinit_late.patch
Log Message:
Modified Files:
wl-kmod-005_kernel_3.15.patch wl-kmod.spec
Added Files:
wl-kmod-005-2_devinit_late.patch
wl-kmod-005-2_devinit_late.patch:
linuxver.h | 4 ++++
1 file changed, 4 insertions(+)
--- NEW FILE wl-kmod-005-2_devinit_late.patch ---
diff -Naur hybrid-v35_64-nodebug-pcoem-6_30_223_141.orig/src/include/linuxver.h hybrid-v35_64-nodebug-pcoem-6_30_223_141/src/include/linuxver.h
--- hybrid-v35_64-nodebug-pcoem-6_30_223_141.orig/src/include/linuxver.h 2013-08-01 08:52:22.000000000 +0200
+++ hybrid-v35_64-nodebug-pcoem-6_30_223_141/src/include/linuxver.h 2014-07-02 18:36:28.616225432 +0200
@@ -169,8 +169,12 @@
#define __devexit
#endif
#ifndef __devinit
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 8, 0)
+#define __devinit
+#else
#define __devinit __init
#endif
+#endif
#ifndef __devinitdata
#define __devinitdata
#endif
wl-kmod-005_kernel_3.15.patch:
wl_cfg80211_hybrid.c | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
Index: wl-kmod-005_kernel_3.15.patch
===================================================================
RCS file: /cvs/nonfree/rpms/wl-kmod/F-20/wl-kmod-005_kernel_3.15.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wl-kmod-005_kernel_3.15.patch 8 Jul 2014 12:58:48 -0000 1.1
+++ wl-kmod-005_kernel_3.15.patch 8 Jul 2014 21:56:30 -0000 1.2
@@ -1,46 +1,28 @@
-From 05dd11abffe27c2fd8f618e79036be026f71b20c Mon Sep 17 00:00:00 2001
-From: Alberto Milone <alberto.milone(a)canonical.com>
-Date: Mon, 12 May 2014 17:32:44 +0200
-Subject: [PATCH 1/1] Add support for Linux 3.15
-
-Make sure to pass the channel to cfg80211_ibss_joined().
-
-This should fix LP: #1307744
----
- src/wl/sys/wl_cfg80211_hybrid.c | 19 +++++++++++++++++++
- 1 file changed, 19 insertions(+)
-
-diff --git a/src/wl/sys/wl_cfg80211_hybrid.c b/src/wl/sys/wl_cfg80211_hybrid.c
-index 3a5e46b..6384e58 100644
---- a/src/wl/sys/wl_cfg80211_hybrid.c
-+++ b/src/wl/sys/wl_cfg80211_hybrid.c
-@@ -1841,7 +1841,26 @@ wl_notify_connect_status(struct wl_cfg80211_priv *wl, struct net_device *ndev,
+diff -Naur hybrid-v35_64-nodebug-pcoem-6_30_223_141.orig/src/wl/sys/wl_cfg80211_hybrid.c hybrid-v35_64-nodebug-pcoem-6_30_223_141/src/wl/sys/wl_cfg80211_hybrid.c
+--- hybrid-v35_64-nodebug-pcoem-6_30_223_141.orig/src/wl/sys/wl_cfg80211_hybrid.c 2013-08-01 08:52:22.000000000 +0200
++++ hybrid-v35_64-nodebug-pcoem-6_30_223_141/src/wl/sys/wl_cfg80211_hybrid.c 2014-07-02 19:31:07.052144739 +0200
+@@ -1841,7 +1841,24 @@
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)
-+ {
-+ struct wl_bss_info *bi;
-+ u16 bss_info_channel;
-+ struct ieee80211_channel *channel;
-+ u32 freq;
++ struct wl_bss_info *bi;
++ u16 bss_info_channel;
++ struct ieee80211_channel *channel;
++ u32 freq;
+
-+ bi = (struct wl_bss_info *)(wl->extra_buf + 4);
-+ bss_info_channel = bi->ctl_ch ? bi->ctl_ch : CHSPEC_CHANNEL(bi->chanspec);
++ bi = (struct wl_bss_info *)(wl->extra_buf + 4);
++ bss_info_channel = bi->ctl_ch ? bi->ctl_ch : CHSPEC_CHANNEL(bi->chanspec);
+
-+ freq = ieee80211_channel_to_frequency(bss_info_channel,
-+ (bss_info_channel <= CH_MAX_2G_CHANNEL) ?
-+ IEEE80211_BAND_2GHZ : IEEE80211_BAND_5GHZ);
++ freq = ieee80211_channel_to_frequency(bss_info_channel,
++ (bss_info_channel <= CH_MAX_2G_CHANNEL) ?
++ IEEE80211_BAND_2GHZ : IEEE80211_BAND_5GHZ);
+
-+ channel = ieee80211_get_channel(wl_to_wiphy(wl), freq);
-+ cfg80211_ibss_joined(ndev, (u8 *)&wl->bssid, channel, GFP_KERNEL);
-+ }
++ channel = ieee80211_get_channel(wl_to_wiphy(wl), freq);
++ cfg80211_ibss_joined(ndev, (u8 *)&wl->bssid, channel, GFP_KERNEL);
+#else
cfg80211_ibss_joined(ndev, (u8 *)&wl->bssid, GFP_KERNEL);
+#endif
set_bit(WL_STATUS_CONNECTED, &wl->status);
wl->profile->active = true;
}
---
-1.9.1
-
Index: wl-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/wl-kmod/F-20/wl-kmod.spec,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -r1.110 -r1.111
--- wl-kmod.spec 8 Jul 2014 12:58:49 -0000 1.110
+++ wl-kmod.spec 8 Jul 2014 21:56:30 -0000 1.111
@@ -19,7 +19,8 @@
Patch1: wl-kmod-002_wext_workaround.patch
Patch2: wl-kmod-003_kernel_3.8.patch
Patch3: wl-kmod-004_kernel_3.10.patch
-Patch4: wl-kmod-005_kernel_3.15.patch
+Patch4: wl-kmod-005-2_devinit_late.patch
+Patch5: wl-kmod-005_kernel_3.15.patch
BuildRequires: %{_bindir}/kmodtool
@@ -62,7 +63,8 @@
%patch1 -p1 -b .wext_workaround.patch
%patch2 -p1 -b .kernel-3.8
%patch3 -p1 -b .kernel-3.10
-%patch4 -p1 -b .kernel-3.15
+%patch4 -p1 -b .devinit_late
+%patch5 -p1 -b .kernel-3.15
popd
for kernel_version in %{?kernel_versions} ; do
@@ -92,6 +94,10 @@
rm -rf $RPM_BUILD_ROOT
%changelog
+* Tue Jul 08 2014 Nicolas Viéville <nicolas.vieville(a)univ-valenciennes.fr> - 6.30.223.141-6
+- Added late patch for __devinit since kernel 3.8
+- Modified patch to build for kernel >= 3.15
+
* Tue Jul 08 2014 Leigh Scott <leigh123linux(a)googlemail.com> - 6.30.223.141-6
- Patch for 3.15 kernel
10 years, 4 months
rpms/wl-kmod/devel wl-kmod-005-2_devinit_late.patch, NONE, 1.1 wl-kmod-005_kernel_3.15.patch, 1.1, 1.2 wl-kmod.spec, 1.83, 1.84
by Nicolas Viéville
Author: nvieville
Update of /cvs/nonfree/rpms/wl-kmod/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv29087
Modified Files:
wl-kmod-005_kernel_3.15.patch wl-kmod.spec
Added Files:
wl-kmod-005-2_devinit_late.patch
Log Message:
* Tue Jul 08 2014 Nicolas Viéville <nicolas.vieville(a)univ-valenciennes.fr> - 6.30.223.141-8
- Added late patch for __devinit since kernel 3.8
- Modified patch to build for kernel >= 3.15
wl-kmod-005-2_devinit_late.patch:
linuxver.h | 4 ++++
1 file changed, 4 insertions(+)
--- NEW FILE wl-kmod-005-2_devinit_late.patch ---
diff -Naur hybrid-v35_64-nodebug-pcoem-6_30_223_141.orig/src/include/linuxver.h hybrid-v35_64-nodebug-pcoem-6_30_223_141/src/include/linuxver.h
--- hybrid-v35_64-nodebug-pcoem-6_30_223_141.orig/src/include/linuxver.h 2013-08-01 08:52:22.000000000 +0200
+++ hybrid-v35_64-nodebug-pcoem-6_30_223_141/src/include/linuxver.h 2014-07-02 18:36:28.616225432 +0200
@@ -169,8 +169,12 @@
#define __devexit
#endif
#ifndef __devinit
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 8, 0)
+#define __devinit
+#else
#define __devinit __init
#endif
+#endif
#ifndef __devinitdata
#define __devinitdata
#endif
wl-kmod-005_kernel_3.15.patch:
wl_cfg80211_hybrid.c | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
Index: wl-kmod-005_kernel_3.15.patch
===================================================================
RCS file: /cvs/nonfree/rpms/wl-kmod/devel/wl-kmod-005_kernel_3.15.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wl-kmod-005_kernel_3.15.patch 22 Apr 2014 16:58:46 -0000 1.1
+++ wl-kmod-005_kernel_3.15.patch 8 Jul 2014 19:47:54 -0000 1.2
@@ -1,12 +1,25 @@
diff -Naur hybrid-v35_64-nodebug-pcoem-6_30_223_141.orig/src/wl/sys/wl_cfg80211_hybrid.c hybrid-v35_64-nodebug-pcoem-6_30_223_141/src/wl/sys/wl_cfg80211_hybrid.c
--- hybrid-v35_64-nodebug-pcoem-6_30_223_141.orig/src/wl/sys/wl_cfg80211_hybrid.c 2013-08-01 08:52:22.000000000 +0200
-+++ hybrid-v35_64-nodebug-pcoem-6_30_223_141/src/wl/sys/wl_cfg80211_hybrid.c 2014-04-22 17:41:44.507896038 +0200
-@@ -1841,7 +1841,11 @@
++++ hybrid-v35_64-nodebug-pcoem-6_30_223_141/src/wl/sys/wl_cfg80211_hybrid.c 2014-07-02 19:31:07.052144739 +0200
+@@ -1841,7 +1841,24 @@
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, &wl->conf->channel, GFP_KERNEL);
++ struct wl_bss_info *bi;
++ u16 bss_info_channel;
++ struct ieee80211_channel *channel;
++ u32 freq;
++
++ bi = (struct wl_bss_info *)(wl->extra_buf + 4);
++ bss_info_channel = bi->ctl_ch ? bi->ctl_ch : CHSPEC_CHANNEL(bi->chanspec);
++
++ freq = ieee80211_channel_to_frequency(bss_info_channel,
++ (bss_info_channel <= CH_MAX_2G_CHANNEL) ?
++ IEEE80211_BAND_2GHZ : IEEE80211_BAND_5GHZ);
++
++ channel = ieee80211_get_channel(wl_to_wiphy(wl), freq);
++ cfg80211_ibss_joined(ndev, (u8 *)&wl->bssid, channel, GFP_KERNEL);
+#else
cfg80211_ibss_joined(ndev, (u8 *)&wl->bssid, GFP_KERNEL);
+#endif
Index: wl-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/wl-kmod/devel/wl-kmod.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- wl-kmod.spec 8 May 2014 10:36:22 -0000 1.83
+++ wl-kmod.spec 8 Jul 2014 19:47:54 -0000 1.84
@@ -7,7 +7,7 @@
Name: wl-kmod
Version: 6.30.223.141
-Release: 7%{?dist}
+Release: 8%{?dist}
Summary: Kernel module for Broadcom wireless devices
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -19,8 +19,9 @@
Patch1: wl-kmod-002_wext_workaround.patch
Patch2: wl-kmod-003_kernel_3.8.patch
Patch3: wl-kmod-004_kernel_3.10.patch
-Patch4: wl-kmod-005_kernel_3.15.patch
-Patch5: wl-kmod-006_gcc_4.9.patch
+Patch4: wl-kmod-005-2_devinit_late.patch
+Patch5: wl-kmod-005_kernel_3.15.patch
+Patch6: wl-kmod-006_gcc_4.9.patch
BuildRequires: %{_bindir}/kmodtool
@@ -63,8 +64,9 @@
%patch1 -p1 -b .wext_workaround.patch
%patch2 -p1 -b .kernel-3.8
%patch3 -p1 -b .kernel-3.10
-%patch4 -p1 -b .kernel-3.15
-%patch5 -p1 -b .gcc-4.9
+%patch4 -p1 -b .devinit_late
+%patch5 -p1 -b .kernel-3.15
+%patch6 -p1 -b .gcc-4.9
popd
for kernel_version in %{?kernel_versions} ; do
@@ -94,6 +96,10 @@
rm -rf $RPM_BUILD_ROOT
%changelog
+* Tue Jul 08 2014 Nicolas Viéville <nicolas.vieville(a)univ-valenciennes.fr> - 6.30.223.141-8
+- Added late patch for __devinit since kernel 3.8
+- Modified patch to build for kernel >= 3.15
+
* Thu May 08 2014 Nicolas Viéville <nicolas.vieville(a)univ-valenciennes.fr> - 6.30.223.141-7
- Added patch to build with gcc >= 4.9 - fix error __TIME__ and __DATE__ macros
10 years, 4 months
rpms/wl-kmod/F-19 wl-kmod-005_devinit_late.patch, NONE, 1.1 wl-kmod.spec, 1.127, 1.128
by Nicolas Viéville
Author: nvieville
Update of /cvs/nonfree/rpms/wl-kmod/F-19
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv28775
Modified Files:
wl-kmod.spec
Added Files:
wl-kmod-005_devinit_late.patch
Log Message:
* Tue Jul 08 2014 Nicolas Viéville <nicolas.vieville(a)univ-valenciennes.fr> - 6.30.223.141-2
- Added late patch for __devinit since kernel 3.8
wl-kmod-005_devinit_late.patch:
linuxver.h | 4 ++++
1 file changed, 4 insertions(+)
--- NEW FILE wl-kmod-005_devinit_late.patch ---
diff -Naur hybrid-v35_64-nodebug-pcoem-6_30_223_141.orig/src/include/linuxver.h hybrid-v35_64-nodebug-pcoem-6_30_223_141/src/include/linuxver.h
--- hybrid-v35_64-nodebug-pcoem-6_30_223_141.orig/src/include/linuxver.h 2013-08-01 08:52:22.000000000 +0200
+++ hybrid-v35_64-nodebug-pcoem-6_30_223_141/src/include/linuxver.h 2014-07-02 18:36:28.616225432 +0200
@@ -169,8 +169,12 @@
#define __devexit
#endif
#ifndef __devinit
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 8, 0)
+#define __devinit
+#else
#define __devinit __init
#endif
+#endif
#ifndef __devinitdata
#define __devinitdata
#endif
Index: wl-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/wl-kmod/F-19/wl-kmod.spec,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -r1.127 -r1.128
--- wl-kmod.spec 8 Jul 2014 11:36:04 -0000 1.127
+++ wl-kmod.spec 8 Jul 2014 19:40:57 -0000 1.128
@@ -3,11 +3,11 @@
# "buildforkernels newest" macro for just that build; immediately after
# queuing that build enable the macro again for subsequent builds; that way
# a new akmod package will only get build when a new one is actually needed
-%global buildforkernels newest
+%global buildforkernels current
Name: wl-kmod
Version: 6.30.223.141
-Release: 1%{?dist}.35
+Release: 2%{?dist}
Summary: Kernel module for Broadcom wireless devices
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -19,6 +19,7 @@
Patch1: wl-kmod-002_wext_workaround.patch
Patch2: wl-kmod-003_kernel_3.8.patch
Patch3: wl-kmod-004_kernel_3.10.patch
+Patch4: wl-kmod-005_devinit_late.patch
BuildRequires: %{_bindir}/kmodtool
@@ -61,6 +62,7 @@
%patch1 -p1 -b .wext_workaround.patch
%patch2 -p1 -b .kernel-3.8
%patch3 -p1 -b .kernel-3.10
+%patch4 -p1 -b .devinit_late
popd
for kernel_version in %{?kernel_versions} ; do
@@ -90,6 +92,9 @@
rm -rf $RPM_BUILD_ROOT
%changelog
+* Tue Jul 08 2014 Nicolas Viéville <nicolas.vieville(a)univ-valenciennes.fr> - 6.30.223.141-2
+- Added late patch for __devinit since kernel 3.8
+
* Tue Jul 08 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 6.30.223.141-1.35
- Rebuilt for kernel
10 years, 4 months
rpms/ffmpeg/devel .cvsignore, 1.56, 1.57 ffmpeg.spec, 1.109, 1.110 sources, 1.56, 1.57
by Julian Sikorski
Author: belegdol
Update of /cvs/free/rpms/ffmpeg/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv27237
Modified Files:
.cvsignore ffmpeg.spec sources
Log Message:
* Tue Jul 08 2014 Julian Sikorski <belegdol(a)fedoraproject.org> - 2.2.4-1
- Updated to 2.2.4
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/devel/.cvsignore,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- .cvsignore 4 Jun 2014 05:33:13 -0000 1.56
+++ .cvsignore 8 Jul 2014 18:29:37 -0000 1.57
@@ -1 +1 @@
-ffmpeg-2.2.3.tar.bz2
+ffmpeg-2.2.4.tar.bz2
Index: ffmpeg.spec
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/devel/ffmpeg.spec,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -r1.109 -r1.110
--- ffmpeg.spec 4 Jun 2014 05:33:13 -0000 1.109
+++ ffmpeg.spec 8 Jul 2014 18:29:37 -0000 1.110
@@ -13,7 +13,7 @@
Summary: Digital VCR and streaming server
Name: ffmpeg
-Version: 2.2.3
+Version: 2.2.4
Release: 1%{?date}%{?date:git}%{?rel}%{?dist}
%if 0%{?_with_amr:1}
License: GPLv3+
@@ -282,6 +282,9 @@
%changelog
+* Tue Jul 08 2014 Julian Sikorski <belegdol(a)fedoraproject.org> - 2.2.4-1
+- Updated to 2.2.4
+
* Wed Jun 04 2014 Julian Sikorski <belegdol(a)fedoraproject.org> - 2.2.3-1
- Updated to 2.2.3
Index: sources
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/devel/sources,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- sources 4 Jun 2014 05:33:13 -0000 1.56
+++ sources 8 Jul 2014 18:29:37 -0000 1.57
@@ -1 +1 @@
-dbb5b6b69bd010916f17df0ae596e0b1 ffmpeg-2.2.3.tar.bz2
+5b85aea53d8dcd5b0f7b497f233bc101 ffmpeg-2.2.4.tar.bz2
10 years, 4 months
rpms/ffmpeg/F-19 .cvsignore, 1.49, 1.50 ffmpeg.spec, 1.91, 1.92 sources, 1.49, 1.50
by Julian Sikorski
Author: belegdol
Update of /cvs/free/rpms/ffmpeg/F-19
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv27003
Modified Files:
.cvsignore ffmpeg.spec sources
Log Message:
* Tue Jun 24 2014 Julian Sikorski <belegdol(a)fedoraproject.org> - 1.2.7-1
- Updated to 1.2.7
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/F-19/.cvsignore,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- .cvsignore 5 Mar 2014 03:25:01 -0000 1.49
+++ .cvsignore 8 Jul 2014 18:14:59 -0000 1.50
@@ -1 +1 @@
-ffmpeg-1.2.6.tar.bz2
+ffmpeg-1.2.7.tar.bz2
Index: ffmpeg.spec
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/F-19/ffmpeg.spec,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- ffmpeg.spec 5 Mar 2014 03:25:01 -0000 1.91
+++ ffmpeg.spec 8 Jul 2014 18:14:59 -0000 1.92
@@ -16,7 +16,7 @@
Summary: Digital VCR and streaming server
Name: ffmpeg
-Version: 1.2.6
+Version: 1.2.7
Release: 1%{?date}%{?date:git}%{?rel}%{?dist}
%if 0%{?_with_amr:1}
License: GPLv3+
@@ -291,6 +291,9 @@
%changelog
+* Tue Jun 24 2014 Julian Sikorski <belegdol(a)fedoraproject.org> - 1.2.7-1
+- Updated to 1.2.7
+
* Wed Mar 05 2014 Julian Sikorski <belegdol(a)fedoraproject.org> - 1.2.6-1
- Updated to 1.2.6
Index: sources
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/F-19/sources,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- sources 5 Mar 2014 03:25:01 -0000 1.49
+++ sources 8 Jul 2014 18:14:59 -0000 1.50
@@ -1 +1 @@
-8f8f243f081de44ca4f0fb1a989875da ffmpeg-1.2.6.tar.bz2
+2d99339ca9cb8c016de61e33fc31a37b ffmpeg-1.2.7.tar.bz2
10 years, 4 months