Author: ceros-guest
Date: 2008-05-04 21:01:22 +0000 (Sun, 04 May 2008)
New Revision: 6856

Added:
   packages/trunk/funguloids/debian/patches/alc_error.patch
Modified:
   packages/trunk/funguloids/debian/changelog
   packages/trunk/funguloids/debian/patches/series
   packages/trunk/funguloids/debian/rules
Log:
Fix problem with running funguloids using openal-soft

Modified: packages/trunk/funguloids/debian/changelog
===================================================================
--- packages/trunk/funguloids/debian/changelog  2008-05-04 19:00:15 UTC (rev 
6855)
+++ packages/trunk/funguloids/debian/changelog  2008-05-04 21:01:22 UTC (rev 
6856)
@@ -5,6 +5,8 @@
     Closes: #478105
   * Fix up patches and rules file.
   * Support disabling of keyboard and mouse capture for debugging.
+  * Fix check where AL errors were being checked while working with AL contexts
+    instead of ALC errors.
 
  -- Andres Mejia <[EMAIL PROTECTED]>  Sun, 04 May 2008 14:58:59 -0400
 

Added: packages/trunk/funguloids/debian/patches/alc_error.patch
===================================================================
--- packages/trunk/funguloids/debian/patches/alc_error.patch                    
        (rev 0)
+++ packages/trunk/funguloids/debian/patches/alc_error.patch    2008-05-04 
21:01:22 UTC (rev 6856)
@@ -0,0 +1,21 @@
+Check ALC errors instead of AL errors.
+=====================================================================
+--- src/openalsoundsystem.cpp.bak      2008-05-04 16:41:32.000000000 -0400
++++ src/openalsoundsystem.cpp  2008-05-04 16:20:52.000000000 -0400
+@@ -266,14 +266,14 @@
+ 
+       int attributes[] = { 0 };
+       mContext = alcCreateContext(mDevice, attributes);
+-      if ( (err = alGetError()) != AL_NO_ERROR) {
++      if ( (err = alcGetError(mDevice)) != ALC_NO_ERROR) {
+               LogManager::getSingleton().logMessage("OpanAL: error creating 
context: " + lastALError(err) );
+               return 1;
+       }
+ //    check_alc_error("Couldn't create audio context: ");
+       alcMakeContextCurrent(mContext);
+ //    check_alc_error("Couldn't select audio context: ");
+-      if ( (err = alGetError()) != AL_NO_ERROR) {
++      if ( (err = alcGetError(mDevice)) != ALC_NO_ERROR) {
+               LogManager::getSingleton().logMessage("OpanAL: error making 
context current: " + lastALError(err) );
+               return 2;
+       }

Modified: packages/trunk/funguloids/debian/patches/series
===================================================================
--- packages/trunk/funguloids/debian/patches/series     2008-05-04 19:00:15 UTC 
(rev 6855)
+++ packages/trunk/funguloids/debian/patches/series     2008-05-04 21:01:22 UTC 
(rev 6856)
@@ -1,3 +1,4 @@
 makefile_modifications.diff -p0
 size_chunks_reverse.patch -p0
 disable_mouse_capture.patch -p0
+alc_error.patch -p0

Modified: packages/trunk/funguloids/debian/rules
===================================================================
--- packages/trunk/funguloids/debian/rules      2008-05-04 19:00:15 UTC (rev 
6855)
+++ packages/trunk/funguloids/debian/rules      2008-05-04 21:01:22 UTC (rev 
6856)
@@ -36,6 +36,7 @@
        dh_testdir
        fromdos -e src/mpakogre.cpp
        fromdos -e src/input.cpp
+       fromdos -e src/openalsoundsystem.cpp
 
 patch: fromdos patch-stamp
 patch-stamp:
@@ -78,6 +79,7 @@
        dh_testdir
        todos -e src/mpakogre.cpp
        todos -e src/input.cpp
+       todos -e src/openalsoundsystem.cpp
 
 install: build
        dh_testdir 


_______________________________________________
Pkg-games-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits

Reply via email to