Skip to content

Commit f7e13bf

Browse files
MyreMylarMyreMylar
committed
Merge branch 'main' into simd-transform-invert
2 parents 1eea1a9 + c291e9e commit f7e13bf

File tree

163 files changed

+5394
-4216
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

163 files changed

+5394
-4216
lines changed

‎.github/workflows/build-debian-multiarch.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
- uses: actions/[email protected]
5151

5252
- name: Build sources and run tests
53-
uses: uraimo/run-on-arch-action@v2.5.1
53+
uses: uraimo/run-on-arch-action@v2.6.0
5454
id: build
5555
with:
5656
arch: ${{ matrix.arch }}

‎.github/workflows/build-manylinux.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,14 +95,14 @@ jobs:
9595

9696
- name: Extract metadata (tags, labels) for Docker
9797
id: meta
98-
uses: docker/metadata-action@96383f45573cb7f253c731d3b3ab81c87ef81934
98+
uses: docker/metadata-action@31cebacef4805868f9ce9a0cb03ee36c32df2ac4
9999
with:
100100
images: ghcr.io/${{ github.repository }}_${{ matrix.arch }}
101101
tags: type=raw,value=${{ hashFiles('buildconfig/manylinux-build/**') }}
102102

103103
- name: Build and push Docker image
104104
if: steps.inspect.outcome == 'failure'
105-
uses: docker/build-push-action@0565240e2d4ab88bba5387d719585280857ece09
105+
uses: docker/build-push-action@4a13e500e55cf31b7a5d59a38ab2040ab0f42f56
106106
with:
107107
context: ${{ github.workspace }}/buildconfig/manylinux-build/docker_base
108108
file: ${{ github.workspace }}/buildconfig/manylinux-build/docker_base/Dockerfile-${{ matrix.arch }}

‎.github/workflows/build-ubuntu-sdist.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ jobs:
6262
sudo apt-mark hold grub-efi-amd64-signed
6363
sudo apt-get update --fix-missing
6464
sudo apt-get upgrade
65-
sudo apt-get install libsdl2-dev libsdl2-image-dev libsdl2-mixer-dev libsdl2-ttf-dev libfreetype6-dev libportmidi-dev libjpeg-dev python3-setuptools python3-dev
65+
sudo apt-get install libsdl2-dev libsdl2-image-dev libsdl2-mixer-dev libsdl2-ttf-dev libfreetype6-dev libportmidi-dev python3-setuptools python3-dev
6666
pip3 install sphinx"<7.2.0" numpy>=1.21.0
6767
6868
- name: Make sdist and install it

‎README.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ Dependency versions:
140140
+----------+------------------------+
141141
| CPython | >= 3.8 (Or use PyPy3) |
142142
+----------+------------------------+
143-
| SDL | >= 2.0.9 |
143+
| SDL | >= 2.0.10 |
144144
+----------+------------------------+
145145
| SDL_mixer| >= 2.0.4 |
146146
+----------+------------------------+

‎buildconfig/Setup.Android.SDL2.in‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,7 @@ SDL = {sdl_includes} -D_REENTRANT -DSDL2 -lSDL2
44
FONT = {sdl_ttf_includes} -lSDL2_ttf
55
IMAGE = {sdl_image_includes} -lSDL2_image
66
MIXER = {sdl_mixer_includes} -lSDL2_mixer
7-
JPEG = {jpeg_includes} -ljpeg
87
SCRAP =
9-
PNG = {png_includes} -lpng16
108
FREETYPE = {freetype_includes} -lfreetype -lharfbuzz
119

1210
DEBUG =
@@ -15,7 +13,7 @@ DEBUG =
1513
#everything you can, but you can ignore ones you don't have
1614
#dependencies for, just comment them out
1715

18-
imageext src_c/imageext.c $(SDL) $(IMAGE) $(PNG) $(JPEG) $(DEBUG)
16+
imageext src_c/imageext.c $(SDL) $(IMAGE) $(DEBUG)
1917
font src_c/font.c $(SDL) $(FONT) $(DEBUG)
2018
mixer src_c/mixer.c $(SDL) $(MIXER) $(DEBUG)
2119
mixer_music src_c/music.c $(SDL) $(MIXER) $(DEBUG)
@@ -50,7 +48,7 @@ key src_c/key.c $(SDL) $(DEBUG)
5048
mouse src_c/mouse.c $(SDL) $(DEBUG)
5149
rect src_c/rect.c src_c/pgcompat_rect.c $(SDL) $(DEBUG)
5250
rwobject src_c/rwobject.c $(SDL) $(DEBUG)
53-
surface src_c/simd_blitters_sse2.c src_c/simd_blitters_avx2.c src_c/surface.c src_c/alphablit.c src_c/surface_fill.c src_c/simd_surface_fill_avx2.c $(SDL) $(DEBUG)
51+
surface src_c/simd_blitters_sse2.c src_c/simd_blitters_avx2.c src_c/surface.c src_c/alphablit.c src_c/surface_fill.c src_c/simd_surface_fill_avx2.c src_c/simd_surface_fill_sse2.c $(SDL) $(DEBUG)
5452
surflock src_c/surflock.c $(SDL) $(DEBUG)
5553
time src_c/time.c $(SDL) $(DEBUG)
5654
joystick src_c/joystick.c $(SDL) $(DEBUG)

‎buildconfig/Setup.Emscripten.SDL2.in‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,7 @@
44
#FONT = -lSDL2_ttf
55
#IMAGE = -lSDL2_image
66
#MIXER = -lSDL2_mixer
7-
#JPEG = -ljpeg
87
#SCRAP =
9-
#PNG = -lpng
108
#FREETYPE = -lfreetype -lharfbuzz
119

1210
DEBUG =
@@ -69,7 +67,7 @@ _sdl2.controller_old src_c/void.c
6967
#_sdl2.touch src_c/_sdl2/touch.c $(SDL) $(DEBUG) -Isrc_c
7068
_sdl2.touch src_c/void.c
7169

72-
#transform src_c/simd_transform_sse2.c src_c/simd_transform_avx2.c src_c/transform.c src_c/rotozoom.c src_c/scale2x.c src_c/scale_mmx.c src_c/simd_surface_fill_avx2.c $(SDL) $(DEBUG) -D_NO_MMX_FOR_X86_64
70+
#transform src_c/simd_transform_sse2.c src_c/simd_transform_avx2.c src_c/transform.c src_c/rotozoom.c src_c/scale2x.c src_c/scale_mmx.c src_c/simd_surface_fill_avx2.c src_c/simd_surface_fill_sse2.c $(SDL) $(DEBUG) -D_NO_MMX_FOR_X86_64
7371
transform src_c/void.c
7472

7573

‎buildconfig/Setup.SDL2.in‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@ SDL = -I/usr/include -D_REENTRANT -DSDL2 -lSDL2
1111
FONT = -lSDL2_ttf
1212
IMAGE = -lSDL2_image
1313
MIXER = -lSDL2_mixer
14-
PNG = -lpng
15-
JPEG = -ljpeg
1614
SCRAP = -lX11
1715
PORTMIDI = -lportmidi
1816
PORTTIME = -lporttime
@@ -25,7 +23,7 @@ DEBUG =
2523
#everything you can, but you can ignore ones you don't have
2624
#dependencies for, just comment them out
2725

28-
imageext src_c/imageext.c $(SDL) $(IMAGE) $(PNG) $(JPEG) $(DEBUG)
26+
imageext src_c/imageext.c $(SDL) $(IMAGE) $(DEBUG)
2927
font src_c/font.c $(SDL) $(FONT) $(DEBUG)
3028
mixer src_c/mixer.c $(SDL) $(MIXER) $(DEBUG)
3129
mixer_music src_c/music.c $(SDL) $(MIXER) $(DEBUG)
@@ -60,7 +58,7 @@ key src_c/key.c $(SDL) $(DEBUG)
6058
mouse src_c/mouse.c $(SDL) $(DEBUG)
6159
rect src_c/rect.c src_c/pgcompat_rect.c $(SDL) $(DEBUG)
6260
rwobject src_c/rwobject.c $(SDL) $(DEBUG)
63-
surface src_c/simd_blitters_sse2.c src_c/simd_blitters_avx2.c src_c/surface.c src_c/alphablit.c src_c/surface_fill.c src_c/simd_surface_fill_avx2.c $(SDL) $(DEBUG)
61+
surface src_c/simd_blitters_sse2.c src_c/simd_blitters_avx2.c src_c/surface.c src_c/alphablit.c src_c/surface_fill.c src_c/simd_surface_fill_avx2.c src_c/simd_surface_fill_sse2.c $(SDL) $(DEBUG)
6462
surflock src_c/surflock.c $(SDL) $(DEBUG)
6563
time src_c/time.c $(SDL) $(DEBUG)
6664
joystick src_c/joystick.c $(SDL) $(DEBUG)

‎buildconfig/config_darwin.py‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,8 +130,6 @@ def main(auto_config=False):
130130
]
131131

132132
DEPS.extend([
133-
Dependency('PNG', 'png.h', 'libpng', ['png']),
134-
Dependency('JPEG', 'jpeglib.h', 'libjpeg', ['jpeg']),
135133
Dependency('PORTMIDI', 'portmidi.h', 'libportmidi', ['portmidi']),
136134
Dependency('PORTTIME', 'porttime.h', '', []),
137135
find_freetype()

‎buildconfig/config_emsdk.py‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333

3434
# user build, make sure ports are pulled in.
3535
if os.environ.get("SDK_VERSION", None) is None:
36-
EMCC_CFLAGS += " -sUSE_SDL=2 -sUSE_LIBPNG -sUSE_LIBJPEG"
36+
EMCC_CFLAGS += " -sUSE_SDL=2"
3737
else:
3838
# make sure CI only pick SDK components.
3939
SDKROOT = os.environ.get("SDKROOT", "/opt/python-wasm-sdk")
@@ -151,7 +151,7 @@ def configure(self, incdirs, libdirs):
151151
self.found = 1
152152
else:
153153

154-
if self.name in ["FONT", "IMAGE", "MIXER", "PNG", "JPEG", "FREETYPE"]:
154+
if self.name in ["FONT", "IMAGE", "MIXER", "FREETYPE"]:
155155
self.found = 1
156156
print(
157157
self.name
@@ -216,8 +216,6 @@ def main(auto_config=False):
216216
]
217217
DEPS.extend(
218218
[
219-
Dependency("PNG", "png.h", "libpng", ["png"]),
220-
Dependency("JPEG", "jpeglib.h", "libjpeg", ["jpeg"]),
221219
# Dependency('SCRAP', '', 'libX11', ['X11']),
222220
# Dependency('GFX', 'SDL_gfxPrimitives.h', 'libSDL_gfx.a', ['SDL_gfx']),
223221
]

‎buildconfig/config_msys2.py‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,8 @@ def hunt_dll(self, search_paths, root):
269269
return True
270270
return False
271271

272-
class DependencyDummy:
272+
273+
class DependencyPlaceholder:
273274
def __init__(self, name):
274275
self.name = name
275276
self.inc_dir = None
@@ -281,6 +282,7 @@ def __init__(self, name):
281282
def configure(self):
282283
pass
283284

285+
284286
class DependencyWin:
285287
def __init__(self, name, cflags):
286288
self.name = name
@@ -329,8 +331,8 @@ def add_dll(self, dll_regex, lib=None, wildcards=None, libs=None, link_lib=None)
329331
self.dlls.append(dep)
330332
return dep
331333

332-
def add_dummy(self, name):
333-
self.dependencies.append(DependencyDummy(name))
334+
def add_placeholder(self, name):
335+
self.dependencies.append(DependencyPlaceholder(name))
334336

335337
def find(self, name):
336338
for dep in self:
@@ -410,7 +412,7 @@ def setup_prebuilt_sdl2(prebuilt_dir):
410412
['SDL', 'vorbisfile'])
411413
DEPS.add('PORTMIDI', 'portmidi', ['portmidi'], r'(lib){0,1}portmidi\.dll$', find_header=r'portmidi\.h')
412414
# #DEPS.add('PORTTIME', 'porttime', ['porttime'], r'porttime\.dll$')
413-
DEPS.add_dummy('PORTTIME')
415+
DEPS.add_placeholder('PORTTIME')
414416

415417
# force use of the correct freetype DLL
416418
ftDep = DEPS.add('FREETYPE', 'freetype', ['SDL2_ttf-[2-9].*', 'freetype-[1-9].*'], r'(lib)?freetype[-0-9]*\.dll$',

0 commit comments

Comments
 (0)