[spring] - EFX crash fix (#969208).
Gilboa Davara
gilboa at fedoraproject.org
Tue Jul 16 12:46:04 UTC 2013
commit cbd6bd11993778eeec10352cd78d09f3c7028920
Author: Gilboa Davara <gilboa at gilboa-home-dev.localdomain>
Date: Tue Jul 16 15:45:19 2013 +0300
- EFX crash fix (#969208).
spring-94-efx-fix.patch | 20 ++++++++++++++++++++
spring.spec | 25 +++++++++++++++----------
2 files changed, 35 insertions(+), 10 deletions(-)
---
diff --git a/spring-94-efx-fix.patch b/spring-94-efx-fix.patch
new file mode 100644
index 0000000..6cbb96c
--- /dev/null
+++ b/spring-94-efx-fix.patch
@@ -0,0 +1,20 @@
+--- rts/System/Sound/EFX.cpp.old 2013-07-15 10:31:03.915698910 +0300
++++ rts/System/Sound/EFX.cpp 2013-07-15 10:31:23.998698907 +0300
+@@ -82,7 +82,7 @@
+ ALuint alFx;
+ alGenEffects(1, &alFx);
+ if (alGetError() == AL_NO_ERROR) {
+- for(size_t i = 0; i < sizeof(effects); i++) {
++ for(size_t i = 0; i < sizeof(effects)/sizeof(effects[0]); i++) {
+ const ALuint fx = effects[i];
+ alEffecti(alFx, AL_EFFECT_TYPE, fx);
+ effectsSupported[fx] = (alGetError() == AL_NO_ERROR);
+@@ -102,7 +102,7 @@
+ ALuint alFilter;
+ alGenFilters(1, &alFilter);
+ if (alGetError() == AL_NO_ERROR) {
+- for(size_t i = 0; i < sizeof(filters); i++) {
++ for(size_t i = 0; i < sizeof(filters)/sizeof(filters[0]); i++) {
+ const ALuint filter = filters[i];
+ alFilteri(alFilter, AL_FILTER_TYPE, filter);
+ filtersSupported[filter] = (alGetError() == AL_NO_ERROR);
diff --git a/spring.spec b/spring.spec
index c8ca996..01fa5f8 100644
--- a/spring.spec
+++ b/spring.spec
@@ -8,7 +8,7 @@
# installer/builddata/bitmaps/README.txt.
Name: spring
Version: 94.1
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Multiplayer, 3D realtime strategy combat game
Group: Amusements/Games
License: GPLv2+ and GPLv3+ and LGPLv2 and GFDL and (GFDL or CC-BY)
@@ -20,6 +20,7 @@ Source1: spring-README.Fedora
Patch0: spring-89-dso.patch
Patch1: spring-89-assimp-remove.patch
Patch2: spring-94-disable-pr-downloader.patch
+Patch3: spring-94-efx-fix.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -55,6 +56,7 @@ great resource, read it here: http://spring.clan-sy.com/wiki/Main_Page
%patch0 -p0 -b .spring-89-dso-fix
%patch1 -p0 -b .spring-89-assimp-remove
%patch2 -p0 -b .spring-94-disable-pr-downloder
+%patch3 -p0 -b .spring-94-efx-fix
cp -p %{SOURCE1} README.Fedora
touch ./rts/build/cmake/FindAllegro.cmake
@@ -149,10 +151,13 @@ rm -rf $RPM_BUILD_ROOT
%changelog
-* Sun Jun 06 2013 Gilboa Davara <gilboad [AT] gmail [DOT] com> - 94.1-2
+* Mon Jul 15 2013 Gilboa Davara <gilboad [AT] gmail [DOT] com> - 94.1-2
+- EFX crash fix (#969208).
+
+* Thu Jun 06 2013 Gilboa Davara <gilboad [AT] gmail [DOT] com> - 94.1-2
- Rebuild for libassimp.so.3.
-* Sun Apr 01 2013 Gilboa Davara <gilboad [AT] gmail [DOT] com> - 94.1-1
+* Mon Apr 01 2013 Gilboa Davara <gilboad [AT] gmail [DOT] com> - 94.1-1
- Version 94.1, major spring/springlobby upstream release.
- Drop the E323AI UTC time patch.
- Update the DSO, assimp-remove patches.
@@ -167,13 +172,13 @@ rm -rf $RPM_BUILD_ROOT
* Sun Sep 09 2012 Gilboa Davara <gilboad [AT] gmail [DOT] com> - 91.0-1
- 91.0: Urgent upstream bugfix release.
-* Sat Aug 12 2012 Gilboa Davara <gilboad [AT] gmail [DOT] com> - 90.0-1
+* Sun Aug 12 2012 Gilboa Davara <gilboad [AT] gmail [DOT] com> - 90.0-1
- 90.0: Upstream release.
- Drop main boost TIME_UTC_ patch.
- ... But add E323AI boost TIME_UTC_ patch...
- pr-downloader still disabled.
-* Sat Aug 12 2012 Gilboa Davara <gilboad [AT] gmail [DOT] com> - 89.0-5
+* Sun Aug 12 2012 Gilboa Davara <gilboad [AT] gmail [DOT] com> - 89.0-5
- Temporary disable pr-downloader to resolve build error.
* Thu Aug 09 2012 Orion Poplawski <orion at nwra.com> - 89.0-4
@@ -202,7 +207,7 @@ rm -rf $RPM_BUILD_ROOT
* Sat Mar 24 2012 Gilboa Davara <gilboad [AT] gmail [DOT] com> - 88.0-1
- 88.0: Upstream bugfix release.
-* Mon Mar 07 2012 Gilboa Davara <gilboad [AT] gmail [DOT] com> - 87.0-1
+* Wed Mar 07 2012 Gilboa Davara <gilboad [AT] gmail [DOT] com> - 87.0-1
- 87.0: Upstream bugfix release.
* Mon Feb 27 2012 Gilboa Davara <gilboad [AT] gmail [DOT] com> - 86.0-1
@@ -211,7 +216,7 @@ rm -rf $RPM_BUILD_ROOT
* Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 84.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-* Tue Dec 24 2011 Gilboa Davara <gilboad [AT] gmail [DOT] com> - 85.0-1
+* Sat Dec 24 2011 Gilboa Davara <gilboad [AT] gmail [DOT] com> - 85.0-1
- 85.0: Upstream bug fix / feature release.
* Tue Nov 22 2011 Gilboa Davara <gilboad [AT] gmail [DOT] com> - 84.0-1
@@ -220,10 +225,10 @@ rm -rf $RPM_BUILD_ROOT
* Sat Nov 19 2011 Gilboa Davara <gilboad [AT] gmail [DOT] com> - 83.0-2
- Static lib 'provides' tags.
-* Tue Nov 7 2011 Gilboa Davara <gilboad [AT] gmail [DOT] com> - 83.0-1
+* Mon Nov 7 2011 Gilboa Davara <gilboad [AT] gmail [DOT] com> - 83.0-1
- New upstream release.
-* Tue Aug 22 2011 Gilboa Davara <gilboad [AT] gmail [DOT] com> - 0.82.7.1-6
+* Mon Aug 22 2011 Gilboa Davara <gilboad [AT] gmail [DOT] com> - 0.82.7.1-6
- Java/F16 compile fix.
* Tue Jul 26 2011 Bruno Wolff III <bruno at wolff.to> - 0.82.7.1-5
@@ -246,7 +251,7 @@ rm -rf $RPM_BUILD_ROOT
- New upstream version: 0.82.7. (Bug fixes: http://springrts.com/phpbb/viewtopic.php?t=24970)
- Include patch applied upstream.
-* Tue Nov 18 2010 Gilboa Davara <gilboad [at] gmail [dot] com> - 0.82.6.1-1
+* Thu Nov 18 2010 Gilboa Davara <gilboad [at] gmail [dot] com> - 0.82.6.1-1
- version 0.82.6.1 (bugfixes, http://springrts.com/phpbb/viewtopic.php?t=24318)
* Tue Sep 07 2010 Aurelien Bompard <abompard at fedoraproject.org> - 0.82.5.1-1
More information about the scm-commits
mailing list