Skip to content

Commit fd129e9

Browse files
Starbuck5Starbuck5
authored
Merge pull request #2595 from Starbuck5/sdl-image-bump
SDL_image 2.8.0
2 parents 5482b63 + 6668911 commit fd129e9

10 files changed

+16
-237
lines changed

‎.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

‎buildconfig/Setup.Android.SDL2.in

Lines changed: 1 addition & 3 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)

‎buildconfig/Setup.Emscripten.SDL2.in

Lines changed: 0 additions & 2 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 =

‎buildconfig/Setup.SDL2.in

Lines changed: 1 addition & 3 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)

‎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_unix.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -222,8 +222,6 @@ def find_freetype():
222222
#Dependency('GFX', 'SDL_gfxPrimitives.h', 'libSDL2_gfx.so', ['SDL2_gfx']),
223223
]
224224
DEPS.extend([
225-
Dependency('PNG', 'png.h', 'libpng', ['png']),
226-
Dependency('JPEG', 'jpeglib.h', 'libjpeg', ['jpeg']),
227225
Dependency('SCRAP', '', 'libX11', ['X11']),
228226
#Dependency('GFX', 'SDL_gfxPrimitives.h', 'libSDL_gfx.so', ['SDL_gfx']),
229227
])

‎buildconfig/config_win.py

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -363,9 +363,13 @@ def _add_sdl2_dll_deps(DEPS):
363363
DEPS.add_dll(r'(lib)?opus[-0-9]*\.dll$', 'opus', ['*opus-[0-9]*'])
364364
DEPS.add_dll(r'(lib)?opusfile[-0-9]*\.dll$', 'opusfile', ['*opusfile-[0-9]*'])
365365
# IMAGE
366+
DEPS.add_dll(r'(lib)?jpeg[-0-9]*\.dll$', 'jpeg', ['*jpeg-[0-9]*'])
367+
DEPS.add_dll(r'(png|libpng)[-0-9]*\.dll$', 'png', ['libpng-[1-9].*'], ['z'])
366368
DEPS.add_dll(r'(lib){0,1}tiff[-0-9]*\.dll$', 'tiff', ['tiff-[0-9]*'], ['jpeg', 'z'])
367369
DEPS.add_dll(r'(z|zlib1)\.dll$', 'z', ['zlib-[1-9].*'])
368370
DEPS.add_dll(r'(lib)?webp[-0-9]*\.dll$', 'webp', ['*webp-[0-9]*'])
371+
DEPS.add_dll(r'(lib)?webpdemux[-0-9]*\.dll$', 'webpdemux', ['*webpdemux-[0-9]*'])
372+
369373

370374
def setup():
371375
DEPS = DependencyGroup()
@@ -376,10 +380,6 @@ def setup():
376380
DEPS.add_placeholder('PORTTIME')
377381
DEPS.add('MIXER', 'SDL2_mixer', ['SDL2_mixer-[1-9].*'], r'(lib){0,1}SDL2_mixer\.dll$',
378382
['SDL'])
379-
DEPS.add('PNG', 'png', ['SDL2_image-[2-9].*', 'libpng-[1-9].*'], r'(png|libpng)[-0-9]*\.dll$', ['z'],
380-
find_header=r'png\.h', find_lib=r'(lib)?png1[-0-9]*\.lib')
381-
DEPS.add('JPEG', 'jpeg', ['SDL2_image-[2-9].*', 'jpeg-9*'], r'(lib){0,1}jpeg-9\.dll$',
382-
find_header=r'jpeglib\.h', find_lib=r'(lib)?jpeg-9\.lib')
383383
DEPS.add('IMAGE', 'SDL2_image', ['SDL2_image-[1-9].*'], r'(lib){0,1}SDL2_image\.dll$',
384384
['SDL', 'jpeg', 'png', 'tiff'], 0)
385385
DEPS.add('FONT', 'SDL2_ttf', ['SDL2_ttf-[2-9].*'], r'(lib){0,1}SDL2_ttf\.dll$', ['SDL', 'z', 'freetype'])
@@ -421,23 +421,13 @@ def setup_prebuilt_sdl2(prebuilt_dir):
421421
DEPS.add('FREETYPE', 'freetype', ['freetype'], r'freetype[-0-9]*\.dll$',
422422
find_header=r'ft2build\.h', find_lib=r'freetype[-0-9]*\.lib')
423423

424-
png = DEPS.add('PNG', 'png', ['SDL2_image-[2-9].*', 'libpng-[1-9].*'], r'(png|libpng)[-0-9]*\.dll$', ['z'],
425-
find_header=r'png\.h', find_lib=r'(lib)?png1[-0-9]*\.lib')
426-
png.path = imageDep.path
427-
png.inc_dir = [os.path.join(prebuilt_dir, 'include').replace('\\', '/')]
428-
png.found = True
429-
jpeg = DEPS.add('JPEG', 'jpeg', ['SDL2_image-[2-9].*', 'jpeg-9*'], r'(lib){0,1}jpeg-9\.dll$',
430-
find_header=r'jpeglib\.h', find_lib=r'(lib)?jpeg-9\.lib')
431-
jpeg.path = imageDep.path
432-
jpeg.inc_dir = [os.path.join(prebuilt_dir, 'include').replace('\\', '/')]
433-
jpeg.found = True
434-
435424
dllPaths = {
436425
'png': imageDep.path,
437426
'jpeg': imageDep.path,
438427
'tiff': imageDep.path,
439428
'z': imageDep.path,
440429
'webp': imageDep.path,
430+
'webpdemux': imageDep.path,
441431

442432
'ogg': mixerDep.path,
443433
'modplug': mixerDep.path,

‎buildconfig/download_win_prebuilt.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,8 @@ def get_urls(x86=True, x64=True):
8282
'7469e9ea44d30a48b0510328cd94b25596e0aa0f',
8383
],
8484
[
85-
'https://www.libsdl.org/projects/SDL_image/release/SDL2_image-devel-2.0.5-VC.zip',
86-
'137f86474691f4e12e76e07d58d5920c8d844d5b',
85+
'https://github.com/pygame-community/SDL_image/releases/download/2.8.0-pgce/SDL2_image-devel-2.8.0-VCpgce.zip',
86+
'da6b6a18f1c53baa775394e769059404925e98d7'
8787
],
8888
[
8989
'https://github.com/libsdl-org/SDL_ttf/releases/download/release-2.20.2/SDL2_ttf-devel-2.20.2-VC.zip',
@@ -201,12 +201,12 @@ def copy(src, dst):
201201
copy(
202202
os.path.join(
203203
temp_dir,
204-
'SDL2_image-devel-2.0.5-VC/SDL2_image-2.0.5'
204+
'SDL2_image-devel-2.8.0-VCpgce/SDL2_image-2.8.0'
205205
),
206206
os.path.join(
207207
move_to_dir,
208208
prebuilt_dir,
209-
'SDL2_image-2.0.5'
209+
'SDL2_image-2.8.0'
210210
)
211211
)
212212
copy(

0 commit comments

Comments
 (0)