[gentoo-commits] gentoo-x86 commit in games-fps/doomsday/files: doomsday-1.9.8-openal-64bit-fix.patch

[Sergey Popov (pinkbyte)]

pinkbyte    12/12/31 09:46:38

  Added:                doomsday-1.9.8-openal-64bit-fix.patch
  Log:
  Fix openal-related code, wrt bug #436016. Thanks to <ghost99 AT mail.ru> for discovering this issue
  
  (Portage version: 2.2.0_alpha144/cvs/Linux x86_64, unsigned Manifest commit)

Revision  Changes    Path
1.1                  games-fps/doomsday/files/doomsday-1.9.8-openal-64bit-fix.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-fps/doomsday/files/doomsday-1.9.8-openal-64bit-fix.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-fps/doomsday/files/doomsday-1.9.8-openal-64bit-fix.patch?rev=1.1&content-type=text/plain

Index: doomsday-1.9.8-openal-64bit-fix.patch
===================================================================
https://github.com/skyjake/Doomsday-Engine/commit/9c1fd1ee90d333332660c1aeef1addae93c2770e

commit 9c1fd1ee90d333332660c1aeef1addae93c2770e
Author: skyjake <skyjake@××××××××.net>
Date:   Sun Dec 30 16:45:56 2012 +0200

    Fixed|OpenAL: Integer conversion in 64-bit build

diff --git a/doomsday/plugins/openal/src/driver_openal.cpp b/doomsday/plugins/openal/src/driver_openal.cpp
index dd3cb2e..683345b 100644
--- a/doomsday/plugins/openal/src/driver_openal.cpp
+++ b/doomsday/plugins/openal/src/driver_openal.cpp
@@ -56,8 +56,8 @@
 
 #define PI 3.141592654
 
-#define SRC(buf) ((ALuint)buf->ptr3D)
-#define BUF(buf) ((ALuint)buf->ptr)
+#define SRC(buf) ( (ALuint) PTR2INT(buf->ptr3D) )
+#define BUF(buf) ( (ALuint) PTR2INT(buf->ptr) )
 
 //enum { VX, VY, VZ };
 
@@ -233,8 +233,8 @@ sfxbuffer_t* DS_SFX_CreateBuffer(int flags, int bits, int rate)
     // Create the buffer object.
     buf = static_cast<sfxbuffer_t*>(Z_Calloc(sizeof(*buf), PU_APPSTATIC, 0));
 
-    buf->ptr = (void*) bufName;
-    buf->ptr3D = (void*) srcName;
+    buf->ptr = INT2PTR(void, bufName);
+    buf->ptr3D = INT2PTR(void, srcName);
     buf->bytes = bits / 8;
     buf->rate = rate;
     buf->flags = flags;