rpms/staging-kmod/F-18 .cvsignore, 1.9, 1.10 sources, 1.9, 1.10 staging-kmod.spec, 1.45, 1.46
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/staging-kmod/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv17149
Modified Files:
.cvsignore sources staging-kmod.spec
Log Message:
* Fri Mar 01 2013 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 3.8.1-1
- Update to 3.8.1
- lot of misc small cleanups -- includes enabling a few more drivers and
remove code and options not relevant anymore
- add sanity check: make sure we do not built modules that are build by Fedora
- add sanity check: make sure each config builds at least one ko file
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/staging-kmod/F-18/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore 14 Jan 2013 20:17:45 -0000 1.9
+++ .cvsignore 1 Mar 2013 22:04:42 -0000 1.10
@@ -1 +1 @@
-linux-staging-3.7.2.tar.bz2
+linux-staging-3.8.1.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/staging-kmod/F-18/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources 14 Jan 2013 20:17:45 -0000 1.9
+++ sources 1 Mar 2013 22:04:43 -0000 1.10
@@ -1 +1 @@
-d1fba18cf7fcc33e5a75068514b1eaa7 linux-staging-3.7.2.tar.bz2
+d2d3eb506fa90d697949caba381b837f linux-staging-3.8.1.tar.bz2
Index: staging-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/staging-kmod/F-18/staging-kmod.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- staging-kmod.spec 28 Feb 2013 23:23:50 -0000 1.45
+++ staging-kmod.spec 1 Mar 2013 22:04:43 -0000 1.46
@@ -1,7 +1,9 @@
# akmods not supported
# which drivers to built
-%global stgdrvs ASUS_OLED BCM_WIMAX EASYCAP ECHO EPL ET131X FB_UDL FB_XGI FT1000_USB HECI IDE_PHISON LINE6_USB RTS_PSTOR RAMZSWAP R8187SE RTL8192SU RTL8192E RTL8192U RTS5139 SLICOSS SOLO6X10 SPEAKUP TOUCHSCREEN_CLEARPAD_TM1217 TOUCHSCREEN_SYNAPTICS_I2C_RMI4 USB_ENESTORAGE USB_WPAN_HCD USBIP_CORE W35UND PRISM2_USB VT6655 VT6656 ZCACHE ZRAM ZSMALLOC
+%global stgdrvs ASUS_OLED BCM_WIMAX CSR_WIFI CXT1E1 DGRP ECHO ET131X FB_XGI FT1000 IDE_PHISON LINE6_USB NET_VENDOR_SILICOM PRISM2_USB R8187SE RTL8192E RTL8192U RTS5139 SB105X SBE_2T3E3 SLICOSS SOLO6X10 SPEAKUP TOUCHSCREEN_CLEARPAD_TM1217 TOUCHSCREEN_SYNAPTICS_I2C_RMI4 TRANZPORT USB_ENESTORAGE USB_SERIAL_QUATECH2 USB_WPAN_HCD USBIP_CORE VT6655 VT6656 WIMAX_GDM72XX WLAGS49_H25 W35UND WLAGS49_H2 ZCACHE ZRAM ZSMALLOC
+
+# fixme: DVB_AS102 DVB_CXD2099
# avoid this error:
# /usr/lib/rpm/debugedit: canonicalization unexpectedly shrank by one character
@@ -19,8 +21,8 @@
#global prever rc8
Name: staging-kmod
-Version: 3.7.2
-Release: %{?prever:0.}1%{?prever:.%{prever}}%{?dist}.11
+Version: 3.8.1
+Release: %{?prever:0.}1%{?prever:.%{prever}}%{?dist}.1
Summary: Selected kernel modules from linux-staging
Group: System Environment/Kernel
@@ -50,7 +52,7 @@
%setup -q -c -T -a 0
# disable drivers that are enabled in Fedora's kernel, as those otherweise would get build
-sed -i 's|.*DABUSB.*||; s|.*SE401.*||; s|.*VICAM.*||; s|.CRYSTALH||; s|.*LIRC.*||; s|.*R8712U.*||;' $(find linux-staging-%{version}%{?prever:-%{prever}}/drivers/staging/ -name 'Makefile')
+sed -i '/.CRYSTALH/ d; /.FIREWIRE_SERIAL/ d; /.LIRC/ d; /.R8712U/ d; ' $(find linux-staging-%{version}%{?prever:-%{prever}}/drivers/staging/ -name 'Makefile')
# seperate directories for each kernel variant (PAE, non-PAE, ...) we build the modules for
for kernel_version in %{?kernel_versions} ; do
@@ -60,31 +62,37 @@
%build
for kernel_version in %{?kernel_versions}; do
+ oldcount=0
+ # sanity check: nothing should be build
+ make %{?_smp_mflags} -C "${kernel_version##*___}" SUBDIRS=${PWD}/_kmod_build_${kernel_version%%___*}/drivers/staging/
+ newcount=$(find ${PWD}/_kmod_build_${kernel_version%%___*}/ -name '*.ko' | wc -l)
+ if (( ${oldcount} != ${newcount} )); then
+ echo "Modules build when not should get build; aborting" >&2
+ exit 1
+ fi
+
+ # preparations
for module in %{stgdrvs} ; do
+ echo
+ echo "### ${module}"
+
+ # sanity check
+ if ! find . -name 'Makefile' | xargs grep "CONFIG_${module}"; then
+ echo "CONFIG_${module} does not exist; aborting" >&2
+ exit 1
+ fi
+
+ # set options
configops="CONFIG_${module}=m"
case "${module}" in
- CX25821)
- configops="${configops} CONFIG_CX25821_ALSA=m"
+ CXT1E1)
+ configops="${configops} CONFIG_SBE_PMCC4_NCOMM=y"
;;
- FT1000_USB)
+ FT1000)
configops="${configops} CONFIG_FT1000_USB=m CONFIG_FT1000_PCMCIA=m"
;;
- PRISM2_USB)
- # does not build on ppc and ppc64 as of 011109; tested with 2.6.31.5
- ( [[ "%{_target_cpu}" == "ppc" ]] || [[ "%{_target_cpu}" == "ppc64" ]] ) && continue
- ;;
- RAMZSWAP)
- configops="${configops} CONFIG_RAMZSWAP_STATS=y"
- ;;
- RT3090)
- configops="${configops} -I ${PWD}/_kmod_build_${kernel_version%%___*}/"
- ;;
- RTL8192SU)
- # does not build on ppc and ppc64 as of 011109; tested with 2.6.31.5
- ( [[ "%{_target_cpu}" == "ppc" ]] || [[ "%{_target_cpu}" == "ppc64" ]] ) && continue
- ;;
- R8712U)
- configops="${configops} CONFIG_R8712_AP=y"
+ NET_VENDOR_SILICOM)
+ configops="${configops} CONFIG_SBYPASS=m CONFIG_BPCTL=m"
;;
RTL8192E)
configops="${configops} CONFIG_RTLLIB=m CONFIG_RTLLIB_CRYPTO_CCMP=m CONFIG_RTLLIB_CRYPTO_TKIP=m CONFIG_RTLLIB_CRYPTO_WEP=m "
@@ -92,29 +100,24 @@
USBIP_CORE)
configops="${configops} CONFIG_USBIP_HOST=m CONFIG_USBIP_VHCI_HCD=m"
;;
- SLICOSS)
- # does not build on ppc and ppc64 as of 011109; tested with 2.6.30.9 and 2.6.31.5
- ( [[ "%{_target_cpu}" == "ppc" ]] || [[ "%{_target_cpu}" == "ppc64" ]] ) && continue
- ;;
SPEAKUP)
configops="${configops} CONFIG_SPEAKUP_SYNTH_ACNTSA=m CONFIG_SPEAKUP_SYNTH_ACNTPC=m CONFIG_SPEAKUP_SYNTH_APOLLO=m CONFIG_SPEAKUP_SYNTH_AUDPTR=m CONFIG_SPEAKUP_SYNTH_BNS=m CONFIG_SPEAKUP_SYNTH_DECTLK=m CONFIG_SPEAKUP_SYNTH_DECEXT=m CONFIG_SPEAKUP_SYNTH_DECPC=m CONFIG_SPEAKUP_SYNTH_DTLK=m CONFIG_SPEAKUP_SYNTH_KEYPC=m CONFIG_SPEAKUP_SYNTH_LTLK=m CONFIG_SPEAKUP_SYNTH_SOFT=m CONFIG_SPEAKUP_SYNTH_SPKOUT=m CONFIG_SPEAKUP_SYNTH_TXPRT=m CONFIG_SPEAKUP_SYNTH_DUMMY=m "
;;
- VIDEO_GO7007)
- configops="${configops} CONFIG_${module}_USB=m"
- ;;
- VIDEO_CX25821)
- configops="${configops} CONFIG_${module}_ALSA=m"
+ WIMAX_GDM72XX)
+ # broken, as of 3.8.1: CONFIG_WIMAX_GDM72XX_QOS=y CONFIG_WIMAX_GDM72XX_SDIO=y
+ configops="${configops} CONFIG_WIMAX_GDM72XX_WIMAX2=y CONFIG_WIMAX_GDM72XX_K_MODE=y CONFIG_WIMAX_GDM72XX_USB=y CONFIG_WIMAX_GDM72XX_USB_PM=y"
;;
esac
- make %{?_smp_mflags} -C "${kernel_version##*___}" SUBDIRS=${PWD}/_kmod_build_${kernel_version%%___*}/drivers/staging/ modules ${configops}
+ make %{?_smp_mflags} -C "${kernel_version##*___}" SUBDIRS=${PWD}/_kmod_build_${kernel_version%%___*}/drivers/staging/ modules CONFIG_STAGING_MEDIA=y ${configops}
- case "${module}" in
- BRCMUTIL)
- # move modules down one level to catch them during install
- mv ${PWD}/_kmod_build_${kernel_version%%___*}/drivers/staging/brcm80211/*/*.ko ${PWD}/_kmod_build_${kernel_version%%___*}/drivers/staging/brcm80211/
- ;;
- esac
+ # sanity check
+ newcount=$(find ${PWD}/_kmod_build_${kernel_version%%___*}/ -name '*.ko' | wc -l)
+ if (( ${oldcount} == ${newcount} )); then
+ echo "Seems no modules were build; aborting" >&2
+ exit 1
+ fi
+ oldcount=${newcount}
done
done
@@ -136,35 +139,12 @@
rm -rf $RPM_BUILD_ROOT
%changelog
-* Thu Feb 28 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 3.7.2-1.11
-- Rebuilt for kernel
-
-* Tue Feb 26 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 3.7.2-1.10
-- Rebuilt for kernel
-
-* Thu Feb 21 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 3.7.2-1.9
-- Rebuilt for kernel
-
-* Sat Feb 16 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 3.7.2-1.8
-- Rebuilt for kernel
-
-* Sat Feb 16 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 3.7.2-1.7
-- Rebuilt for kernel
-
-* Wed Feb 13 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 3.7.2-1.6
-- Rebuilt for kernel
-
-* Tue Feb 05 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 3.7.2-1.5
-- Rebuilt for kernel
-
-* Wed Jan 30 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 3.7.2-1.4
-- Rebuilt for updated kernel
-
-* Fri Jan 25 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 3.7.2-1.3
-- Rebuilt for updated kernel
-
-* Thu Jan 17 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 3.7.2-1.2
-- Rebuilt for updated kernel
+* Fri Mar 01 2013 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 3.8.1-1
+- Update to 3.8.1
+- lot of misc small cleanups -- includes enabling a few more drivers and
+ remove code and options not relevant anymore
+- add sanity check: make sure we do not built modules that are build by Fedora
+- add sanity check: make sure each config builds at least one ko file
* Mon Jan 14 2013 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 3.7.2-1
- Update to 3.7.2
11 years, 1 month
rpms/wl-kmod/devel broadcom-wl-5.100.82.112-kernel-3.8.patch, NONE, 1.1 wl-kmod.spec, 1.71, 1.72
by Nicolas Viéville
Author: nvieville
Update of /cvs/nonfree/rpms/wl-kmod/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv3858
Modified Files:
wl-kmod.spec
Added Files:
broadcom-wl-5.100.82.112-kernel-3.8.patch
Log Message:
* Fri Mar 01 2013 Nicolas Vieville <nicolas.vieville(a)univ-valenciennes.fr> - 5.100.82.112-8
- Added patch to build for kernel >= 3.8
broadcom-wl-5.100.82.112-kernel-3.8.patch:
include/bcmutils.h | 4 ++++
wl/sys/wl_cfg80211.c | 20 ++++++++++++++++++++
2 files changed, 24 insertions(+)
--- NEW FILE broadcom-wl-5.100.82.112-kernel-3.8.patch ---
diff -Naur hybrid-portsrc_x86_32-v5_100_82_112.orig/src/include/bcmutils.h hybrid-portsrc_x86_32-v5_100_82_112/src/include/bcmutils.h
--- hybrid-portsrc_x86_32-v5_100_82_112.orig/src/include/bcmutils.h 2011-10-22 18:56:55.000000000 +0200
+++ hybrid-portsrc_x86_32-v5_100_82_112/src/include/bcmutils.h 2013-03-01 16:30:53.730371474 +0100
@@ -555,7 +555,11 @@
extern void prhex(const char *msg, uchar *buf, uint len);
extern bcm_tlv_t *BCMROMFN(bcm_next_tlv)(bcm_tlv_t *elt, int *buflen);
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 8, 0)
extern bcm_tlv_t *BCMROMFN(bcm_parse_tlvs)(void *buf, int buflen, uint key);
+#else
+extern bcm_tlv_t *BCMROMFN(bcm_parse_tlvs)(const void *buf, int buflen, uint key);
+#endif
extern bcm_tlv_t *BCMROMFN(bcm_parse_ordered_tlvs)(void *buf, int buflen, uint key);
extern const char *bcmerrorstr(int bcmerror);
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 2012-11-07 18:16:51.000000000 +0100
+++ hybrid-portsrc_x86_32-v5_100_82_112/src/wl/sys/wl_cfg80211.c 2013-03-01 16:40:19.344706682 +0100
@@ -751,7 +751,11 @@
else
memset(&join_params.params.bssid, 0, ETHER_ADDR_LEN);
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 8, 0)
wl_ch_to_chanspec(params->channel, &join_params, &join_params_size);
+#else
+ wl_ch_to_chanspec(params->chandef.chan, &join_params, &join_params_size);
+#endif
err = wl_dev_ioctl(dev, WLC_SET_SSID, &join_params, join_params_size);
if (err) {
@@ -2054,7 +2058,12 @@
u16 beacon_interval;
s32 dtim_period;
size_t ie_len;
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 8, 0)
u8 *ie;
+#else
+ const u8 *ie;
+ const struct cfg80211_bss_ies *ies;
+#endif
s32 err = 0;
ssid = &wl->profile->ssid;
@@ -2085,8 +2094,19 @@
beacon_interval = cpu_to_le16(bi->beacon_period);
} else {
WL_DBG(("Found the AP in the list - BSSID %pM\n", bss->bssid));
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 8, 0)
ie = bss->information_elements;
ie_len = bss->len_information_elements;
+#else
+ ies = (const struct cfg80211_bss_ies*)rcu_dereference(bss->ies);
+ if (!ies) {
+ /* This should never happen */
+ err = -EIO;
+ goto update_bss_info_out;
+ }
+ ie = ies->data;
+ ie_len = (size_t)(ies->len);
+#endif
beacon_interval = bss->beacon_interval;
cfg80211_put_bss(bss);
}
Index: wl-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/wl-kmod/devel/wl-kmod.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- wl-kmod.spec 21 Nov 2012 12:16:10 -0000 1.71
+++ wl-kmod.spec 1 Mar 2013 16:55:22 -0000 1.72
@@ -3,31 +3,32 @@
# "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
-%define buildforkernels akmod
+%global buildforkernels akmod
-Name: wl-kmod
-Version: 5.100.82.112
-Release: 7%{?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_100_82_11...
-Source1: http://www.broadcom.com/docs/linux_sta/hybrid-portsrc_x86_64-v5_100_82_11...
-Source11: broadcom-wl-kmodtool-excludekernel-filterfile
-Patch0: broadcom-wl-5.100.82.112-license.patch
-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
-Patch5: broadcom-wl-5.100.82.112-recent_kernel_semaphore.patch
-Patch6: broadcom-wl-5.100.82.112-recent_kernel_ioctl.patch
-Patch7: broadcom-wl-5.100.82.112-wext_workaround.patch
+Name: wl-kmod
+Version: 5.100.82.112
+Release: 8%{?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_100_82_11...
+Source1: http://www.broadcom.com/docs/linux_sta/hybrid-portsrc_x86_64-v5_100_82_11...
+Source11: broadcom-wl-kmodtool-excludekernel-filterfile
+Patch0: broadcom-wl-5.100.82.112-license.patch
+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
+Patch5: broadcom-wl-5.100.82.112-recent_kernel_semaphore.patch
+Patch6: broadcom-wl-5.100.82.112-recent_kernel_ioctl.patch
+Patch7: broadcom-wl-5.100.82.112-wext_workaround.patch
+Patch8: broadcom-wl-5.100.82.112-kernel-3.8.patch
-BuildRequires: %{_bindir}/kmodtool
+BuildRequires: %{_bindir}/kmodtool
# needed for plague to make sure it builds for i586 and i686
-ExclusiveArch: i686 x86_64
+ExclusiveArch: i686 x86_64
# ppc disabled because broadcom only provides x86 and x86_64 bits
%{!?kernels:BuildRequires: buildsys-build-rpmfusion-kerneldevpkgs-%{?buildforkernels:%{buildforkernels}}%{!?buildforkernels:current}-%{_target_cpu} }
@@ -68,6 +69,7 @@
%patch5 -p1 -b .recent_kernel_semaphore
%patch6 -p1 -b .recent_kernel_ioctl
%patch7 -p1 -b .wext_workaround.patch
+%patch8 -p1 -b .kernel-3.8
popd
for kernel_version in %{?kernel_versions} ; do
@@ -97,6 +99,9 @@
rm -rf $RPM_BUILD_ROOT
%changelog
+* Fri Mar 01 2013 Nicolas Vieville <nicolas.vieville(a)univ-valenciennes.fr> - 5.100.82.112-8
+- Added patch to build for kernel >= 3.8
+
* Wed Nov 21 2012 Nicolas Viéville <nicolas.vieville(a)univ-valenciennes.fr> - 5.100.82.112-7
- Added patch to choose API at build time (WEXT or CFG80211) to workaround #2548 #2562
- Others patches cleaned-up
11 years, 1 month
rpms/wl-kmod/F-18 broadcom-wl-5.100.82.112-kernel-3.8.patch, NONE, 1.1 wl-kmod.spec, 1.85, 1.86
by Nicolas Viéville
Author: nvieville
Update of /cvs/nonfree/rpms/wl-kmod/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv3460
Modified Files:
wl-kmod.spec
Added Files:
broadcom-wl-5.100.82.112-kernel-3.8.patch
Log Message:
* Fri Mar 01 2013 Nicolas Vieville <nicolas.vieville(a)univ-valenciennes.fr> - 5.100.82.112-8
- Added patch to build for kernel >= 3.8
broadcom-wl-5.100.82.112-kernel-3.8.patch:
include/bcmutils.h | 4 ++++
wl/sys/wl_cfg80211.c | 20 ++++++++++++++++++++
2 files changed, 24 insertions(+)
--- NEW FILE broadcom-wl-5.100.82.112-kernel-3.8.patch ---
diff -Naur hybrid-portsrc_x86_32-v5_100_82_112.orig/src/include/bcmutils.h hybrid-portsrc_x86_32-v5_100_82_112/src/include/bcmutils.h
--- hybrid-portsrc_x86_32-v5_100_82_112.orig/src/include/bcmutils.h 2011-10-22 18:56:55.000000000 +0200
+++ hybrid-portsrc_x86_32-v5_100_82_112/src/include/bcmutils.h 2013-03-01 16:30:53.730371474 +0100
@@ -555,7 +555,11 @@
extern void prhex(const char *msg, uchar *buf, uint len);
extern bcm_tlv_t *BCMROMFN(bcm_next_tlv)(bcm_tlv_t *elt, int *buflen);
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 8, 0)
extern bcm_tlv_t *BCMROMFN(bcm_parse_tlvs)(void *buf, int buflen, uint key);
+#else
+extern bcm_tlv_t *BCMROMFN(bcm_parse_tlvs)(const void *buf, int buflen, uint key);
+#endif
extern bcm_tlv_t *BCMROMFN(bcm_parse_ordered_tlvs)(void *buf, int buflen, uint key);
extern const char *bcmerrorstr(int bcmerror);
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 2012-11-07 18:16:51.000000000 +0100
+++ hybrid-portsrc_x86_32-v5_100_82_112/src/wl/sys/wl_cfg80211.c 2013-03-01 16:40:19.344706682 +0100
@@ -751,7 +751,11 @@
else
memset(&join_params.params.bssid, 0, ETHER_ADDR_LEN);
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 8, 0)
wl_ch_to_chanspec(params->channel, &join_params, &join_params_size);
+#else
+ wl_ch_to_chanspec(params->chandef.chan, &join_params, &join_params_size);
+#endif
err = wl_dev_ioctl(dev, WLC_SET_SSID, &join_params, join_params_size);
if (err) {
@@ -2054,7 +2058,12 @@
u16 beacon_interval;
s32 dtim_period;
size_t ie_len;
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 8, 0)
u8 *ie;
+#else
+ const u8 *ie;
+ const struct cfg80211_bss_ies *ies;
+#endif
s32 err = 0;
ssid = &wl->profile->ssid;
@@ -2085,8 +2094,19 @@
beacon_interval = cpu_to_le16(bi->beacon_period);
} else {
WL_DBG(("Found the AP in the list - BSSID %pM\n", bss->bssid));
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 8, 0)
ie = bss->information_elements;
ie_len = bss->len_information_elements;
+#else
+ ies = (const struct cfg80211_bss_ies*)rcu_dereference(bss->ies);
+ if (!ies) {
+ /* This should never happen */
+ err = -EIO;
+ goto update_bss_info_out;
+ }
+ ie = ies->data;
+ ie_len = (size_t)(ies->len);
+#endif
beacon_interval = bss->beacon_interval;
cfg80211_put_bss(bss);
}
Index: wl-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/wl-kmod/F-18/wl-kmod.spec,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- wl-kmod.spec 28 Feb 2013 23:43:36 -0000 1.85
+++ wl-kmod.spec 1 Mar 2013 16:40:57 -0000 1.86
@@ -3,31 +3,32 @@
# "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: 5.100.82.112
-Release: 7%{?dist}.16
-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_100_82_11...
-Source1: http://www.broadcom.com/docs/linux_sta/hybrid-portsrc_x86_64-v5_100_82_11...
-Source11: broadcom-wl-kmodtool-excludekernel-filterfile
-Patch0: broadcom-wl-5.100.82.112-license.patch
-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
-Patch5: broadcom-wl-5.100.82.112-recent_kernel_semaphore.patch
-Patch6: broadcom-wl-5.100.82.112-recent_kernel_ioctl.patch
-Patch7: broadcom-wl-5.100.82.112-wext_workaround.patch
+Name: wl-kmod
+Version: 5.100.82.112
+Release: 8%{?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_100_82_11...
+Source1: http://www.broadcom.com/docs/linux_sta/hybrid-portsrc_x86_64-v5_100_82_11...
+Source11: broadcom-wl-kmodtool-excludekernel-filterfile
+Patch0: broadcom-wl-5.100.82.112-license.patch
+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
+Patch5: broadcom-wl-5.100.82.112-recent_kernel_semaphore.patch
+Patch6: broadcom-wl-5.100.82.112-recent_kernel_ioctl.patch
+Patch7: broadcom-wl-5.100.82.112-wext_workaround.patch
+Patch8: broadcom-wl-5.100.82.112-kernel-3.8.patch
-BuildRequires: %{_bindir}/kmodtool
+BuildRequires: %{_bindir}/kmodtool
# needed for plague to make sure it builds for i586 and i686
-ExclusiveArch: i686 x86_64
+ExclusiveArch: i686 x86_64
# ppc disabled because broadcom only provides x86 and x86_64 bits
%{!?kernels:BuildRequires: buildsys-build-rpmfusion-kerneldevpkgs-%{?buildforkernels:%{buildforkernels}}%{!?buildforkernels:current}-%{_target_cpu} }
@@ -68,6 +69,7 @@
%patch5 -p1 -b .recent_kernel_semaphore
%patch6 -p1 -b .recent_kernel_ioctl
%patch7 -p1 -b .wext_workaround.patch
+%patch8 -p1 -b .kernel-3.8
popd
for kernel_version in %{?kernel_versions} ; do
@@ -97,6 +99,9 @@
rm -rf $RPM_BUILD_ROOT
%changelog
+* Fri Mar 01 2013 Nicolas Vieville <nicolas.vieville(a)univ-valenciennes.fr> - 5.100.82.112-8
+- Added patch to build for kernel >= 3.8
+
* Thu Feb 28 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 5.100.82.112-7.16
- Rebuilt for kernel
11 years, 1 month
rpms/nvidia-173xx-kmod/F-18 3.7_kernel.patch, 1.1, 1.2 nvidia-173xx-kmod.spec, 1.67, 1.68
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/nvidia-173xx-kmod/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv714/F-18
Modified Files:
3.7_kernel.patch nvidia-173xx-kmod.spec
Log Message:
Update fix for 3.8
3.7_kernel.patch:
conftest.sh | 7 ++++++-
nv.c | 4 ++++
2 files changed, 10 insertions(+), 1 deletion(-)
Index: 3.7_kernel.patch
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-173xx-kmod/F-18/3.7_kernel.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 3.7_kernel.patch 8 Jan 2013 14:09:38 -0000 1.1
+++ 3.7_kernel.patch 1 Mar 2013 15:09:36 -0000 1.2
@@ -24,7 +24,7 @@
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"
++ CFLAGS="$CFLAGS -I$SOURCES/arch/x86/include -I$SOURCES/arch/x86/include/uapi"
+ CFLAGS="$CFLAGS -I$OUTPUT/arch/x86/include/generated"
+ CFLAGS="$CFLAGS -I$OUTPUT/arch/x86/include/generated/uapi"
fi
Index: nvidia-173xx-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-173xx-kmod/F-18/nvidia-173xx-kmod.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- nvidia-173xx-kmod.spec 28 Feb 2013 23:43:17 -0000 1.67
+++ nvidia-173xx-kmod.spec 1 Mar 2013 15:09:36 -0000 1.68
@@ -3,12 +3,12 @@
# "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 newest
Name: nvidia-173xx-kmod
Version: 173.14.36
# Taken over by kmodtool
-Release: 4%{?dist}.5
+Release: 5%{?dist}
Summary: NVIDIA 173xx display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -98,6 +98,9 @@
%changelog
+* Fri Mar 01 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 173.14.36-5
+- Modify 3.7 patch for 3.8 kernel
+
* Thu Feb 28 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 173.14.36-4.5
- Rebuilt for kernel
11 years, 1 month
rpms/nvidia-kmod/F-18 3.7_kernel.patch, 1.1, 1.2 nvidia-kmod.spec, 1.131, 1.132
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/nvidia-kmod/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv32162/F-18
Modified Files:
3.7_kernel.patch nvidia-kmod.spec
Log Message:
Modify 3.7 patch for 3.8 kernel
3.7_kernel.patch:
conftest.sh | 7 ++++++-
nv-mmap.c | 4 ++++
2 files changed, 10 insertions(+), 1 deletion(-)
Index: 3.7_kernel.patch
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/F-18/3.7_kernel.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 3.7_kernel.patch 18 Nov 2012 19:11:13 -0000 1.1
+++ 3.7_kernel.patch 1 Mar 2013 14:50:35 -0000 1.2
@@ -24,7 +24,7 @@
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"
++ CFLAGS="$CFLAGS -I$SOURCES/arch/x86/include -I$SOURCES/arch/x86/include/uapi"
+ CFLAGS="$CFLAGS -I$OUTPUT/arch/x86/include/generated"
+ CFLAGS="$CFLAGS -I$OUTPUT/arch/x86/include/generated/uapi"
elif [ "$ARCH" = "arm" ]; then
Index: nvidia-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/F-18/nvidia-kmod.spec,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -r1.131 -r1.132
--- nvidia-kmod.spec 28 Feb 2013 23:43:27 -0000 1.131
+++ nvidia-kmod.spec 1 Mar 2013 14:50:35 -0000 1.132
@@ -3,13 +3,13 @@
# "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 newest
Name: nvidia-kmod
Epoch: 1
Version: 304.64
# Taken over by kmodtool
-Release: 6%{?dist}.5
+Release: 7%{?dist}
Summary: NVIDIA display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -88,6 +88,9 @@
%changelog
+* Fri Mar 01 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1:304.64-7
+- Modify 3.7 patch for 3.8 kernel
+
* Thu Feb 28 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1:304.64-6.5
- Rebuilt for kernel
11 years, 1 month
rpms/vbam/devel .cvsignore,1.4,1.5 sources,1.4,1.5 vbam.spec,1.8,1.9
by Jeremy Newton
Author: jem256
Update of /cvs/free/rpms/vbam/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv19190/devel
Modified Files:
.cvsignore sources vbam.spec
Log Message:
Updated to latest upstream
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/vbam/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore 10 Dec 2012 20:45:49 -0000 1.4
+++ .cvsignore 1 Mar 2013 06:49:29 -0000 1.5
@@ -1 +1 @@
-vbam-1.8.0.1149.tar.xz
+vbam-r1159-src.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/vbam/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 10 Dec 2012 20:45:49 -0000 1.4
+++ sources 1 Mar 2013 06:49:29 -0000 1.5
@@ -1 +1 @@
-4d6efcce9664942ae9a569d63b8c099d vbam-1.8.0.1149.tar.xz
+e7482def4cd5d7ced65d4f9282161c77 vbam-r1159-src.tar.bz2
Index: vbam.spec
===================================================================
RCS file: /cvs/free/rpms/vbam/devel/vbam.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- vbam.spec 30 Jan 2013 16:55:52 -0000 1.8
+++ vbam.spec 1 Mar 2013 06:49:29 -0000 1.9
@@ -1,18 +1,13 @@
Name: vbam
-#Pre-release version 1.8.0.1149 is a snapshot of svn 1149
-Version: 1.8.0.1149
-Release: 2%{?dist}
+#Pre-release version 1.8.0.1159 is a snapshot of svn 1159
+Version: 1.8.0.1159
+Release: 1%{?dist}
#Will not create a binary vbam package, only vbam-gtk and vbam-sdl subpackages
Summary: High compatibility Gameboy Advance Emulator combining VBA developments
License: GPLv2
Url: http://www.vba-m.com
-##To download source run these commands:
-#svn co -r 1149 https://vbam.svn.sourceforge.net/svnroot/vbam vbam-temp
-#cd vbam-temp && rm -r -f trunk/project && mv trunk vbam-1.8.0.1149
-#tar -Jcv --exclude-vcs -f ../vbam-1.8.0.1149.tar.xz vbam-1.8.0.1149
-#cd .. && rm -r -f vbam-temp
-Source: %{name}-%{version}.tar.xz
+Source: http://downloads.sourceforge.net/project/%{name}/%{name}-src/%{name}-r115...
BuildRequires: SDL-devel
BuildRequires: zip
BuildRequires: ImageMagick
@@ -83,7 +78,7 @@
Advance project, with many improvements from various developments of VBA.
%prep
-%setup -q
+%setup -q -c %{name}-%{version}
sed -i '/CMAKE_C.*_FLAGS/d' CMakeLists.txt
%build
@@ -134,8 +129,9 @@
/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%changelog
-* Wed Jan 30 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1.8.0.1149-2
-- Rebuilt for ffmpeg
+* Fri Mar 1 2013 Jeremy Newton <alexjnewt(a)hotmail.com> - 1.8.0.1159-1
+- Updated to new upstream version
+- Fixed some spec date typos
* Mon Dec 10 2012 Jeremy Newton <alexjnewt(a)hotmail.com> - 1.8.0.1149-1
- Updated to new upstream version
@@ -158,7 +154,7 @@
* Tue Feb 14 2012 Jeremy Newton <alexjnewt(a)hotmail.com> - 1.8.0.1054-4
- Changed building commands to avoid failed builds
-* Thu Jan 29 2012 Jeremy Newton <alexjnewt(a)hotmail.com> - 1.8.0.1054-3
+* Sun Jan 29 2012 Jeremy Newton <alexjnewt(a)hotmail.com> - 1.8.0.1054-3
- Added missing Build Requirement: openal-soft-devel
- Removed redundant license files
11 years, 1 month
rpms/vbam/F-18 .cvsignore,1.4,1.5 sources,1.4,1.5 vbam.spec,1.7,1.8
by Jeremy Newton
Author: jem256
Update of /cvs/free/rpms/vbam/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv19013/F-18
Modified Files:
.cvsignore sources vbam.spec
Log Message:
Update to latest upsteam
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/vbam/F-18/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore 10 Dec 2012 20:44:52 -0000 1.4
+++ .cvsignore 1 Mar 2013 06:48:41 -0000 1.5
@@ -1 +1 @@
-vbam-1.8.0.1149.tar.xz
+vbam-r1159-src.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/vbam/F-18/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 10 Dec 2012 20:44:53 -0000 1.4
+++ sources 1 Mar 2013 06:48:41 -0000 1.5
@@ -1 +1 @@
-4d6efcce9664942ae9a569d63b8c099d vbam-1.8.0.1149.tar.xz
+e7482def4cd5d7ced65d4f9282161c77 vbam-r1159-src.tar.bz2
Index: vbam.spec
===================================================================
RCS file: /cvs/free/rpms/vbam/F-18/vbam.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- vbam.spec 10 Dec 2012 20:44:53 -0000 1.7
+++ vbam.spec 1 Mar 2013 06:48:41 -0000 1.8
@@ -1,18 +1,13 @@
Name: vbam
-#Pre-release version 1.8.0.1149 is a snapshot of svn 1149
-Version: 1.8.0.1149
+#Pre-release version 1.8.0.1159 is a snapshot of svn 1159
+Version: 1.8.0.1159
Release: 1%{?dist}
#Will not create a binary vbam package, only vbam-gtk and vbam-sdl subpackages
Summary: High compatibility Gameboy Advance Emulator combining VBA developments
License: GPLv2
Url: http://www.vba-m.com
-##To download source run these commands:
-#svn co -r 1149 https://vbam.svn.sourceforge.net/svnroot/vbam vbam-temp
-#cd vbam-temp && rm -r -f trunk/project && mv trunk vbam-1.8.0.1149
-#tar -Jcv --exclude-vcs -f ../vbam-1.8.0.1149.tar.xz vbam-1.8.0.1149
-#cd .. && rm -r -f vbam-temp
-Source: %{name}-%{version}.tar.xz
+Source: http://downloads.sourceforge.net/project/%{name}/%{name}-src/%{name}-r115...
BuildRequires: SDL-devel
BuildRequires: zip
BuildRequires: ImageMagick
@@ -83,7 +78,7 @@
Advance project, with many improvements from various developments of VBA.
%prep
-%setup -q
+%setup -q -c %{name}-%{version}
sed -i '/CMAKE_C.*_FLAGS/d' CMakeLists.txt
%build
@@ -134,6 +129,10 @@
/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%changelog
+* Fri Mar 1 2013 Jeremy Newton <alexjnewt(a)hotmail.com> - 1.8.0.1159-1
+- Updated to new upstream version
+- Fixed some spec date typos
+
* Mon Dec 10 2012 Jeremy Newton <alexjnewt(a)hotmail.com> - 1.8.0.1149-1
- Updated to new upstream version
- FFMpeg dep removed due to only needed by wx and now disabled by default
@@ -155,7 +154,7 @@
* Tue Feb 14 2012 Jeremy Newton <alexjnewt(a)hotmail.com> - 1.8.0.1054-4
- Changed building commands to avoid failed builds
-* Thu Jan 29 2012 Jeremy Newton <alexjnewt(a)hotmail.com> - 1.8.0.1054-3
+* Sun Jan 29 2012 Jeremy Newton <alexjnewt(a)hotmail.com> - 1.8.0.1054-3
- Added missing Build Requirement: openal-soft-devel
- Removed redundant license files
11 years, 1 month
rpms/vbam/F-17 .cvsignore,1.3,1.4 sources,1.3,1.4 vbam.spec,1.3,1.4
by Jeremy Newton
Author: jem256
Update of /cvs/free/rpms/vbam/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv18785/F-17
Modified Files:
.cvsignore sources vbam.spec
Log Message:
Update to latest upstream
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/vbam/F-17/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 5 Jul 2012 18:21:10 -0000 1.3
+++ .cvsignore 1 Mar 2013 06:48:00 -0000 1.4
@@ -1 +1 @@
-vbam-1.8.0.1097.tar.xz
+vbam-r1159-src.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/vbam/F-17/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 5 Jul 2012 18:21:10 -0000 1.3
+++ sources 1 Mar 2013 06:48:00 -0000 1.4
@@ -1 +1 @@
-34aa21848c996d499454028ad8a11b30 vbam-1.8.0.1097.tar.xz
+e7482def4cd5d7ced65d4f9282161c77 vbam-r1159-src.tar.bz2
Index: vbam.spec
===================================================================
RCS file: /cvs/free/rpms/vbam/F-17/vbam.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- vbam.spec 5 Jul 2012 18:21:11 -0000 1.3
+++ vbam.spec 1 Mar 2013 06:48:00 -0000 1.4
@@ -1,18 +1,13 @@
Name: vbam
-#Pre-release version 1.8.0.1097 is a snapshot of svn 1097
-Version: 1.8.0.1097
+#Pre-release version 1.8.0.1159 is a snapshot of svn 1159
+Version: 1.8.0.1159
Release: 1%{?dist}
#Will not create a binary vbam package, only vbam-gtk and vbam-sdl subpackages
Summary: High compatibility Gameboy Advance Emulator combining VBA developments
License: GPLv2
Url: http://www.vba-m.com
-##To download source run these commands:
-#svn co -r 1097 https://vbam.svn.sourceforge.net/svnroot/vbam vbam-temp
-#cd vbam-temp && rm -r -f trunk/project && mv trunk vbam-1.8.0.1097
-#tar -Jcv --exclude-vcs -f ../vbam-1.8.0.1097.tar.xz vbam-1.8.0.1097
-#cd .. && rm -r -f vbam-temp
-Source: %{name}-%{version}.tar.xz
+Source: http://downloads.sourceforge.net/project/%{name}/%{name}-src/%{name}-r115...
BuildRequires: SDL-devel
BuildRequires: zip
BuildRequires: ImageMagick
@@ -28,7 +23,6 @@
BuildRequires: gtkglextmm-devel
BuildRequires: gtkmm24-devel
BuildRequires: cairo-devel
-BuildRequires: ffmpeg-devel
BuildRequires: SFML-devel
BuildRequires: openal-soft-devel
@@ -84,13 +78,12 @@
Advance project, with many improvements from various developments of VBA.
%prep
-%setup -q
+%setup -q -c %{name}-%{version}
sed -i '/CMAKE_C.*_FLAGS/d' CMakeLists.txt
%build
%cmake -DBUILD_SHARED_LIBS:BOOL=OFF -DVERSION=%{version} -DCMAKE_SKIP_RPATH=ON -DENABLE_LINK=ON
-#Needed for rpmfusion build servers
-free -m
+#V=1 Needed for rpmfusion build servers
make V=1
%install
@@ -136,6 +129,14 @@
/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%changelog
+* Fri Mar 1 2013 Jeremy Newton <alexjnewt(a)hotmail.com> - 1.8.0.1159-1
+- Updated to new upstream version
+- Fixed some spec date typos
+
+* Mon Dec 10 2012 Jeremy Newton <alexjnewt(a)hotmail.com> - 1.8.0.1149-1
+- Updated to new upstream version
+- FFMpeg dep removed due to only needed by wx and now disabled by default
+
* Thu Jul 5 2012 Jeremy Newton <alexjnewt(a)hotmail.com> - 1.8.0.1097-1
- Updated to new upstream version
- Disabling WX because its not supported
@@ -153,7 +154,7 @@
* Tue Feb 14 2012 Jeremy Newton <alexjnewt(a)hotmail.com> - 1.8.0.1054-4
- Changed building commands to avoid failed builds
-* Thu Jan 29 2012 Jeremy Newton <alexjnewt(a)hotmail.com> - 1.8.0.1054-3
+* Sun Jan 29 2012 Jeremy Newton <alexjnewt(a)hotmail.com> - 1.8.0.1054-3
- Added missing Build Requirement: openal-soft-devel
- Removed redundant license files
11 years, 1 month