Author: Tim Felgentreff <[email protected]>
Branch:
Changeset: r5:5c7bcc86c8f9
Date: 2013-03-15 16:31 +0100
http://bitbucket.org/pypy/lang-gameboy/changeset/5c7bcc86c8f9/
Log: Update rsdl to work with after rpython split
diff --git a/rsdl/RIMG.py b/rsdl/RIMG.py
--- a/rsdl/RIMG.py
+++ b/rsdl/RIMG.py
@@ -1,7 +1,7 @@
import sys
-from pypy.rpython.lltypesystem import lltype, rffi
-from pypy.rpython.tool import rffi_platform as platform
-from pypy.translator.tool.cbuild import ExternalCompilationInfo
+from rpython.rtyper.lltypesystem import lltype, rffi
+from rpython.rtyper.tool import rffi_platform as platform
+from rpython.translator.tool.cbuild import ExternalCompilationInfo
from rsdl import RSDL
diff --git a/rsdl/RMix.py b/rsdl/RMix.py
--- a/rsdl/RMix.py
+++ b/rsdl/RMix.py
@@ -1,7 +1,7 @@
import sys
-from pypy.rpython.lltypesystem import lltype, rffi
-from pypy.rpython.tool import rffi_platform as platform
-from pypy.translator.tool.cbuild import ExternalCompilationInfo
+from rpython.rtyper.lltypesystem import lltype, rffi
+from rpython.rtyper.tool import rffi_platform as platform
+from rpython.translator.tool.cbuild import ExternalCompilationInfo
from rsdl import RSDL
diff --git a/rsdl/RSDL.py b/rsdl/RSDL.py
--- a/rsdl/RSDL.py
+++ b/rsdl/RSDL.py
@@ -1,8 +1,8 @@
-from pypy.rpython.lltypesystem import lltype, rffi
-from pypy.rpython.tool import rffi_platform as platform
+from rpython.rtyper.lltypesystem import lltype, rffi
+from rpython.rtyper.tool import rffi_platform as platform
from rsdl.constants import _constants
from rsdl.eci import get_rsdl_compilation_info
-from pypy.rlib.objectmodel import we_are_translated
+from rpython.rlib.objectmodel import we_are_translated
import py
import sys
@@ -162,6 +162,11 @@
Uint32, Uint32, Uint32, Uint32],
SurfacePtr)
+CreateRGBSurfaceFrom = external('SDL_CreateRGBSurfaceFrom',
+ [rffi.VOIDP, rffi.INT, rffi.INT, rffi.INT,
rffi.INT,
+ Uint32, Uint32, Uint32, Uint32],
+ SurfacePtr)
+
LockSurface = external('SDL_LockSurface',
[SurfacePtr],
rffi.INT)
diff --git a/rsdl/RSDL_helper.py b/rsdl/RSDL_helper.py
--- a/rsdl/RSDL_helper.py
+++ b/rsdl/RSDL_helper.py
@@ -1,4 +1,4 @@
-from pypy.rpython.lltypesystem import lltype, rffi
+from rpython.rtyper.lltypesystem import lltype, rffi
from rsdl import RSDL
def get_rgb(color, format):
@@ -105,4 +105,3 @@
dstrect = mallocrect(x, y, rffi.getintfield(src, 'c_w'),
rffi.getintfield(src, 'c_w'))
RSDL.BlitSurface(src, lltype.nullptr(RSDL.Rect), dst, dstrect)
lltype.free(dstrect, flavor='raw')
-
diff --git a/rsdl/eci.py b/rsdl/eci.py
--- a/rsdl/eci.py
+++ b/rsdl/eci.py
@@ -1,5 +1,5 @@
-from pypy.translator.tool.cbuild import ExternalCompilationInfo
-from pypy.translator.platform import CompilationError
+from rpython.translator.tool.cbuild import ExternalCompilationInfo
+from rpython.translator.platform import CompilationError
import py
import sys
diff --git a/rsdl/test/conftest.py b/rsdl/test/conftest.py
--- a/rsdl/test/conftest.py
+++ b/rsdl/test/conftest.py
@@ -1,4 +1,4 @@
-from pypy.rlib.rsdl.eci import check_sdl_installation, SDLNotInstalled
+from rsdl.eci import check_sdl_installation, SDLNotInstalled
import py
def pytest_ignore_collect(path):
diff --git a/rsdl/test/test_basic.py b/rsdl/test/test_basic.py
--- a/rsdl/test/test_basic.py
+++ b/rsdl/test/test_basic.py
@@ -1,7 +1,7 @@
import py
-from pypy.rlib.rsdl import RSDL
-from pypy.rlib.rarithmetic import r_uint
-from pypy.rpython.lltypesystem import rffi
+from rsdl import RSDL
+from rpython.rlib.rarithmetic import r_uint
+from rpython.rtyper.lltypesystem import rffi
def test_sdl_init():
@@ -34,4 +34,4 @@
i = RSDL.GetTicks()
assert i >= 10
RSDL.Quit()
-
\ No newline at end of file
+
diff --git a/rsdl/test/test_sdl_image.py b/rsdl/test/test_sdl_image.py
--- a/rsdl/test/test_sdl_image.py
+++ b/rsdl/test/test_sdl_image.py
@@ -1,6 +1,6 @@
import py, os
from rsdl import RSDL, RIMG, RSDL_helper, test
-from pypy.rpython.lltypesystem import lltype, rffi
+from rpython.rtyper.lltypesystem import lltype, rffi
this_dir = test.__path__[0]
diff --git a/rsdl/test/test_sdl_mixer.py b/rsdl/test/test_sdl_mixer.py
--- a/rsdl/test/test_sdl_mixer.py
+++ b/rsdl/test/test_sdl_mixer.py
@@ -1,8 +1,8 @@
import py
import os
import time
-from pypy.rlib.rsdl import RSDL, RMix, RSDL_helper
-from pypy.rpython.lltypesystem import lltype, rffi
+from rsdl import RSDL, RMix, RSDL_helper
+from rpython.rtyper.lltypesystem import lltype, rffi
def test_open_mixer():
if RMix.OpenAudio(22050, RSDL.AUDIO_S16LSB, 2, 1024) != 0:
diff --git a/rsdl/test/test_surface.py b/rsdl/test/test_surface.py
--- a/rsdl/test/test_surface.py
+++ b/rsdl/test/test_surface.py
@@ -1,7 +1,7 @@
import py, sys
-from pypy.rlib.rsdl import RSDL, RSDL_helper
-from pypy.rlib.rarithmetic import r_uint
-from pypy.rpython.lltypesystem import lltype, rffi
+from rsdl import RSDL, RSDL_helper
+from rpython.rlib.rarithmetic import r_uint
+from rpython.rtyper.lltypesystem import lltype, rffi
class TestSurface:
diff --git a/rsdl/test/test_video.py b/rsdl/test/test_video.py
--- a/rsdl/test/test_video.py
+++ b/rsdl/test/test_video.py
@@ -1,8 +1,8 @@
import py, sys
-from pypy.rlib.rsdl import RSDL, RSDL_helper
-from pypy.rlib.rarithmetic import r_uint
-from pypy.rpython.lltypesystem import lltype, rffi
+from rsdl import RSDL, RSDL_helper
+from rpython.rlib.rarithmetic import r_uint
+from rpython.rtyper.lltypesystem import lltype, rffi
#
# This test file is skipped unless run with "py.test --view".
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
