Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/games
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv13415/games
Modified Files:
sdl.info
Added Files:
sdl.patch
Log Message:
New SDL revision, with an alternative fix for building on 64bit systems
--- NEW FILE: sdl.patch ---
diff -ru SDL-1.2.14/src/cpuinfo/SDL_cpuinfo.c
/Users/mhorn/Projekte/foreign/SDL/SDL-1.2/src/cpuinfo/SDL_cpuinfo.c
--- SDL-1.2.14/src/cpuinfo/SDL_cpuinfo.c 2009-10-13 01:07:14.000000000
+0200
+++ /Users/mhorn/Projekte/foreign/SDL/SDL-1.2/src/cpuinfo/SDL_cpuinfo.c
2009-11-01 20:30:29.000000000 +0100
@@ -148,7 +148,7 @@
int features = 0;
#if defined(__GNUC__) && defined(i386)
__asm__ (
-" movl %%ebx,%%edi\n"
+" pushl %%ebx\n"
" xorl %%eax,%%eax # Set up for CPUID instruction \n"
" cpuid # Get and save vendor ID \n"
" cmpl $1,%%eax # Make sure 1 is valid input for CPUID\n"
@@ -158,14 +158,14 @@
" cpuid # Get family/model/stepping/features\n"
" movl %%edx,%0 \n"
"1: \n"
-" movl %%edi,%%ebx\n"
+" popl %%ebx\n"
: "=m" (features)
:
- : "%eax", "%ecx", "%edx", "%edi"
+ : "%eax", "%ecx", "%edx"
);
#elif defined(__GNUC__) && defined(__x86_64__)
__asm__ (
-" movq %%rbx,%%rdi\n"
+" pushq %%rbx\n"
" xorl %%eax,%%eax # Set up for CPUID instruction \n"
" cpuid # Get and save vendor ID \n"
" cmpl $1,%%eax # Make sure 1 is valid input for CPUID\n"
@@ -175,10 +175,10 @@
" cpuid # Get family/model/stepping/features\n"
" movl %%edx,%0 \n"
"1: \n"
-" movq %%rdi,%%rbx\n"
+" popq %%rbx\n"
: "=m" (features)
:
- : "%rax", "%rbx", "%rcx", "%rdx", "%rdi"
+ : "%rax", "%rcx", "%rdx"
);
#elif (defined(_MSC_VER) && defined(_M_IX86)) || defined(__WATCOMC__)
__asm {
@@ -194,7 +194,7 @@
}
#elif defined(__sun) && (defined(__i386) || defined(__amd64))
__asm(
-" movl %ebx,%edi\n"
+" pushl %ebx\n"
" xorl %eax,%eax \n"
" cpuid \n"
" cmpl $1,%eax \n"
@@ -208,7 +208,7 @@
" movl %edx,-8(%rbp) \n"
#endif
"1: \n"
-" movl %edi,%ebx\n" );
+" popl %ebx\n" );
#endif
return features;
}
@@ -218,7 +218,7 @@
int features = 0;
#if defined(__GNUC__) && defined(i386)
__asm__ (
-" movl %%ebx,%%edi\n"
+" pushl %%ebx\n"
" movl $0x80000000,%%eax # Query for extended functions \n"
" cpuid # Get extended function limit \n"
" cmpl $0x80000001,%%eax \n"
@@ -227,14 +227,14 @@
" cpuid # and get the information \n"
" movl %%edx,%0 \n"
"1: \n"
-" movl %%edi,%%ebx\n"
+" popl %%ebx\n"
: "=m" (features)
:
- : "%eax", "%ecx", "%edx", "%edi"
+ : "%eax", "%ecx", "%edx"
);
#elif defined(__GNUC__) && defined (__x86_64__)
__asm__ (
-" movq %%rbx,%%rdi\n"
+" pushq %%rbx\n"
" movl $0x80000000,%%eax # Query for extended functions \n"
" cpuid # Get extended function limit \n"
" cmpl $0x80000001,%%eax \n"
@@ -243,10 +243,10 @@
" cpuid # and get the information \n"
" movl %%edx,%0 \n"
"1: \n"
-" movq %%rdi,%%rbx\n"
+" popq %%rbx\n"
: "=m" (features)
:
- : "%rax", "%rbx", "%rcx", "%rdx", "%rdi"
+ : "%rax", "%rcx", "%rdx"
);
#elif (defined(_MSC_VER) && defined(_M_IX86)) || defined(__WATCOMC__)
__asm {
@@ -261,7 +261,7 @@
}
#elif defined(__sun) && ( defined(__i386) || defined(__amd64) )
__asm (
-" movl %ebx,%edi\n"
+" pushl %ebx\n"
" movl $0x80000000,%eax \n"
" cpuid \n"
" cmpl $0x80000001,%eax \n"
@@ -274,7 +274,7 @@
" movl %edx,-8(%rbp) \n"
#endif
"1: \n"
-" movl %edi,%ebx\n"
+" popl %ebx\n"
);
#endif
return features;
diff -ru SDL-1.2.14/src/video/quartz/SDL_QuartzGL.m
/Users/mhorn/Projekte/foreign/SDL/SDL-1.2/src/video/quartz/SDL_QuartzGL.m
--- SDL-1.2.14/src/video/quartz/SDL_QuartzGL.m 2009-10-13 01:07:14.000000000
+0200
+++ /Users/mhorn/Projekte/foreign/SDL/SDL-1.2/src/video/quartz/SDL_QuartzGL.m
2009-10-23 14:52:29.000000000 +0200
@@ -153,7 +153,7 @@
* http://lists.apple.com/archives/mac-opengl/2006/Jan/msg00080.html )
*/
if ( this->gl_config.swap_control >= 0 ) {
- long value;
+ GLint value;
value = this->gl_config.swap_control;
[ gl_context setValues: &value forParameter: NSOpenGLCPSwapInterval ];
}
@@ -175,7 +175,7 @@
#endif
{
- long cache_max = 64;
+ GLint cache_max = 64;
CGLContextObj ctx = QZ_GetCGLContextObj(gl_context);
CGLSetParameter (ctx, GLI_SUBMIT_FUNC_CACHE_MAX, &cache_max);
CGLSetParameter (ctx, GLI_ARRAY_FUNC_CACHE_MAX, &cache_max);
@@ -261,7 +261,7 @@
}
case SDL_GL_ACCELERATED_VISUAL:
{
- long val;
+ GLint val;
/* FIXME: How do we get this information here?
[fmt getValues: &val forAttribute: NSOpenGLPFAAccelerated attr
forVirtualScreen: 0];
*/
@@ -271,7 +271,7 @@
}
case SDL_GL_SWAP_CONTROL:
{
- long val;
+ GLint val;
[ gl_context getValues: &val forParameter: NSOpenGLCPSwapInterval
];
*value = val;
return 0;
Index: sdl.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/games/sdl.info,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- sdl.info 23 Oct 2009 08:51:17 -0000 1.23
+++ sdl.info 2 Nov 2009 09:54:43 -0000 1.24
@@ -16,21 +16,17 @@
Package: sdl
Version: 1.2.14
-Revision: 4
+Revision: 5
BuildDependsOnly: True
Depends: %N-shlibs (= %v-%r)
BuildDepends: x11-dev, fink (>= 0.24.12), (%m = x86_64) gcc4.2
Maintainer: Max Horn <[email protected]>
Source: http://www.libsdl.org/release/SDL-%v.tar.gz
Source-MD5: e52086d1b508fa0b76c52ee30b55bec4
+PatchFile: %n.patch
+PatchFile-MD5: a4d66600e3a1d5394efe492d26330446
ConfigureParams: --mandir=%p/share/man
-CompileScript: <<
-#!/bin/sh -ev
-if [ "%m" == "x86_64" ]; then
- export CC=gcc-4.2
-fi
-./configure %c; DISTCC_HOSTS='' MAKEFLAGS='-j1' make
-<<
+CompileScript: ./configure %c; DISTCC_HOSTS='' MAKEFLAGS='-j1' make
InstallScript: make install DESTDIR=%d
SplitOff: <<
Package: %N-shlibs
@@ -41,11 +37,11 @@
<<
DescPackaging: <<
Added DISTCC_HOSTS='' MAKEFLAGS='-j1' to avoid the -fconstant-cfstrings
warning
- when building with distcc (-- [email protected])
+ when building with distcc (-- [email protected]).
- Worked around a build issue in SDL_x11gl.c on some systems, apparently
- caused by differences in the OpenGL headers (possibly caused by a
- newer/older X11 version being presented on affected systems).
+ Fix problem in SDL_cpuinfo.c by backporting fix from SDL SVN.
+
+ Fix some warnings occuring on x86_64 in SDL_QuartzGL.m, from SDL SVN.
<<
DocFiles: BUGS COPYING CREDITS README README-SDL.txt README.MacOSX TODO
Description: Cross-platform multimedia library
------------------------------------------------------------------------------
Come build with us! The BlackBerry(R) Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay
ahead of the curve. Join us from November 9 - 12, 2009. Register now!
http://p.sf.net/sfu/devconference
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
