This updated pygame patch now allows it to detect libpng and build on a gcc4 Haiku,

but it's still not actually finding and using png files, at least test_sprite.py is failing saying
" sprite_surface2 = pygame.image.load(os.path.join(data_dir, "static.png")) 
pygame.error: File is not a Windows BMP file
This commit is contained in:
Scott McCreary
2010-09-17 18:41:53 +00:00
parent 8b807267c8
commit b2c65c120b

View File

@@ -1,6 +1,6 @@
diff -urN pygame-1.9.1release/config.py pygame-1.9.1release-haiku/config.py
--- pygame-1.9.1release/config.py 2009-07-09 06:13:20.021495808 +0000
+++ pygame-1.9.1release-haiku/config.py 2010-09-17 06:39:52.000000000 +0000
--- pygame-1.9.1release/config.py 2009-07-09 06:13:20.025952256 +0000
+++ pygame-1.9.1release-haiku/config.py 2010-09-17 09:54:05.000000000 +0000
@@ -119,6 +119,9 @@
elif sys.platform == 'win32':
print_('Using WINDOWS mingw/msys configuration...\n')
@@ -13,8 +13,8 @@ diff -urN pygame-1.9.1release/config.py pygame-1.9.1release-haiku/config.py
import config_darwin as CFG
diff -urN pygame-1.9.1release/config_haiku.py pygame-1.9.1release-haiku/config_haiku.py
--- pygame-1.9.1release/config_haiku.py 1970-01-01 00:00:00.000000000 +0000
+++ pygame-1.9.1release-haiku/config_haiku.py 2010-09-17 06:52:03.000000000 +0000
@@ -0,0 +1,186 @@
+++ pygame-1.9.1release-haiku/config_haiku.py 2010-09-17 10:02:14.000000000 +0000
@@ -0,0 +1,187 @@
+"""Config on Haiku"""
+
+import os, sys
@@ -161,8 +161,9 @@ diff -urN pygame-1.9.1release/config_haiku.py pygame-1.9.1release-haiku/config_h
+ DependencyProg('SMPEG', 'SMPEG_CONFIG', 'smpeg-config', '0.4.3', ['smpeg']),
+ Dependency('PNG', 'png.h', 'libpng', ['png']),
+ Dependency('JPEG', 'jpeglib.h', 'libjpeg', ['jpeg']),
+ #Dependency('PORTMIDI', 'portmidi.h', 'libportmidi.so', ['portmidi']),
+ #Dependency('PORTTIME', 'porttime.h', 'libporttime.so', ['porttime']),
+ Dependency('SCRAP', '', 'libX11', ['X11']),
+ Dependency('PORTMIDI', 'portmidi.h', 'libportmidi.so', ['portmidi']),
+ Dependency('PORTTIME', 'porttime.h', 'libporttime.so', ['porttime']),
+ #Dependency('GFX', 'SDL_gfxPrimitives.h', 'libSDL_gfx.so', ['SDL_gfx']),
+ ]
+ if not DEPS[0].found: