mirror of https://github.com/kivy/kivy.git
Bump `SDL2` version to `2.28.5` and `SDL_image` to `2.8.0` in build dependencies script and update `kivy_deps.sdl2` on Windows (#8479)
* Bump SDL2 version in build dependencies script * Use pre-release 2.7.1 for sdl_image * Link for pre-releases is different * sdl_image 2.8.0 has now been released * Update kivy_deps.sdl2 and kivy_deps.sdl2-dev to 0.7.0 (to reflect the same changes made in Linux and macOS build scripts)
This commit is contained in:
parent
0cdbd8cc5e
commit
c957fee22a
|
@ -3,10 +3,10 @@ requires = [
|
|||
"setuptools", "wheel", "packaging",
|
||||
"cython>=0.29.1,<=3.0.0",
|
||||
'kivy_deps.gstreamer_dev~=0.3.3; sys_platform == "win32"',
|
||||
'kivy_deps.sdl2_dev~=0.6.0; sys_platform == "win32"',
|
||||
'kivy_deps.sdl2_dev~=0.7.0; sys_platform == "win32"',
|
||||
'kivy_deps.glew_dev~=0.3.1; sys_platform == "win32"',
|
||||
'kivy_deps.gstreamer~=0.3.3; sys_platform == "win32"',
|
||||
'kivy_deps.sdl2~=0.6.0; sys_platform == "win32"',
|
||||
'kivy_deps.sdl2~=0.7.0; sys_platform == "win32"',
|
||||
'kivy_deps.glew~=0.3.1; sys_platform == "win32"',
|
||||
]
|
||||
|
||||
|
|
10
setup.cfg
10
setup.cfg
|
@ -20,7 +20,7 @@ install_requires =
|
|||
docutils
|
||||
pygments
|
||||
kivy_deps.angle~=0.3.3; sys_platform == "win32"
|
||||
kivy_deps.sdl2~=0.6.0; sys_platform == "win32"
|
||||
kivy_deps.sdl2~=0.7.0; sys_platform == "win32"
|
||||
kivy_deps.glew~=0.3.1; sys_platform == "win32"
|
||||
pypiwin32; sys_platform == "win32"
|
||||
dependency_links = https://github.com/kivy-garden/garden/archive/master.zip
|
||||
|
@ -42,7 +42,7 @@ dev =
|
|||
sphinxcontrib-jquery
|
||||
funcparserlib==1.0.0a0
|
||||
kivy_deps.gstreamer_dev~=0.3.3; sys_platform == "win32"
|
||||
kivy_deps.sdl2_dev~=0.6.0; sys_platform == "win32"
|
||||
kivy_deps.sdl2_dev~=0.7.0; sys_platform == "win32"
|
||||
kivy_deps.glew_dev~=0.3.1; sys_platform == "win32"
|
||||
flake8
|
||||
pre-commit
|
||||
|
@ -53,7 +53,7 @@ base =
|
|||
docutils
|
||||
pygments
|
||||
kivy_deps.angle~=0.3.3; sys_platform == "win32"
|
||||
kivy_deps.sdl2~=0.6.0; sys_platform == "win32"
|
||||
kivy_deps.sdl2~=0.7.0; sys_platform == "win32"
|
||||
kivy_deps.glew~=0.3.1; sys_platform == "win32"
|
||||
pypiwin32; sys_platform == "win32"
|
||||
media =
|
||||
|
@ -65,7 +65,7 @@ full =
|
|||
pygments
|
||||
kivy_deps.gstreamer~=0.3.3; sys_platform == "win32"
|
||||
kivy_deps.angle~=0.3.3; sys_platform == "win32"
|
||||
kivy_deps.sdl2~=0.6.0; sys_platform == "win32"
|
||||
kivy_deps.sdl2~=0.7.0; sys_platform == "win32"
|
||||
kivy_deps.glew~=0.3.1; sys_platform == "win32"
|
||||
ffpyplayer; sys_platform == "linux" or sys_platform == "darwin"
|
||||
pypiwin32; sys_platform == "win32"
|
||||
|
@ -75,7 +75,7 @@ gstreamer =
|
|||
angle =
|
||||
kivy_deps.angle~=0.3.3; sys_platform == "win32"
|
||||
sdl2 =
|
||||
kivy_deps.sdl2~=0.6.0; sys_platform == "win32"
|
||||
kivy_deps.sdl2~=0.7.0; sys_platform == "win32"
|
||||
glew =
|
||||
kivy_deps.glew~=0.3.1; sys_platform == "win32"
|
||||
|
||||
|
|
|
@ -2,12 +2,12 @@
|
|||
set -e -x
|
||||
|
||||
# manylinux SDL2
|
||||
MANYLINUX__SDL2__VERSION="2.26.4"
|
||||
MANYLINUX__SDL2__VERSION="2.28.5"
|
||||
MANYLINUX__SDL2__URL="https://github.com/libsdl-org/SDL/releases/download/release-$MANYLINUX__SDL2__VERSION/SDL2-$MANYLINUX__SDL2__VERSION.tar.gz"
|
||||
MANYLINUX__SDL2__FOLDER="SDL2-$MANYLINUX__SDL2__VERSION"
|
||||
|
||||
# manylinux SDL2_image
|
||||
MANYLINUX__SDL2_IMAGE__VERSION="2.6.3"
|
||||
MANYLINUX__SDL2_IMAGE__VERSION="2.8.0"
|
||||
MANYLINUX__SDL2_IMAGE__URL="https://github.com/libsdl-org/SDL_image/releases/download/release-$MANYLINUX__SDL2_IMAGE__VERSION/SDL2_image-$MANYLINUX__SDL2_IMAGE__VERSION.tar.gz"
|
||||
MANYLINUX__SDL2_IMAGE__FOLDER="SDL2_image-$MANYLINUX__SDL2_IMAGE__VERSION"
|
||||
|
||||
|
|
|
@ -1,12 +1,12 @@
|
|||
set -e -x
|
||||
|
||||
# macOS SDL2
|
||||
MACOS__SDL2__VERSION="2.26.4"
|
||||
MACOS__SDL2__VERSION="2.28.5"
|
||||
MACOS__SDL2__URL="https://github.com/libsdl-org/SDL/releases/download/release-$MACOS__SDL2__VERSION/SDL2-$MACOS__SDL2__VERSION.tar.gz"
|
||||
MACOS__SDL2__FOLDER="SDL2-${MACOS__SDL2__VERSION}"
|
||||
|
||||
# macOS SDL2_image
|
||||
MACOS__SDL2_IMAGE__VERSION="2.6.3"
|
||||
MACOS__SDL2_IMAGE__VERSION="2.8.0"
|
||||
MACOS__SDL2_IMAGE__URL="https://github.com/libsdl-org/SDL_image/releases/download/release-$MACOS__SDL2_IMAGE__VERSION/SDL2_image-$MACOS__SDL2_IMAGE__VERSION.tar.gz"
|
||||
MACOS__SDL2_IMAGE__FOLDER="SDL2_image-${MACOS__SDL2_IMAGE__VERSION}"
|
||||
|
||||
|
|
Loading…
Reference in New Issue