Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump SDL to 2.26.4 (along with other deps bumps) #2057

Merged
merged 1 commit into from
Mar 30, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 6 additions & 9 deletions buildconfig/manylinux-build/docker_base/Dockerfile-aarch64
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,12 @@ RUN rpm --import /tmp/RPM-GPG-KEY.dag.txt

#RUN rpm -i /tmp/${RPMFORGE_FILE}

# Install SDL and portmidi dependencies
RUN yum install -y zlib-devel libX11-devel\
mesa-libGLU-devel audiofile-devel \
java-1.7.0-openjdk-devel jpackage-utils \
giflib-devel dbus-devel \
dejavu-sans-fonts fontconfig \
libXcursor-devel libXi-devel libXxf86vm-devel \
libXrandr-devel libXinerama-devel libXcomposite-devel mesa-libGLU-devel xz
RUN yum install -y libcap-devel libxkbcommon-devel
# it's okay to install X11 and friends from outdated centos repos because newer
# libs are dynamically loaded at runtime
RUN yum install -y zlib-devel dbus-devel fontconfig xz systemd-devel \
mesa-libGLU-devel libcap-devel libxkbcommon-devel \
libX11-devel libXext-devel libXrandr-devel libXcursor-devel libXfixes-devel \
libXi-devel libXScrnSaver-devel

# With this we
# 1) Force install prefix to /usr/local
Expand Down
16 changes: 6 additions & 10 deletions buildconfig/manylinux-build/docker_base/Dockerfile-i686
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,12 @@ RUN rpm --import /tmp/RPM-GPG-KEY.dag.txt

#RUN rpm -i /tmp/${RPMFORGE_FILE}

# Install SDL and portmidi dependencies
RUN linux32 yum install -y zlib-devel libX11-devel \
mesa-libGLU-devel audiofile-devel \
java-1.7.0-openjdk-devel jpackage-utils \
giflib-devel
RUN linux32 yum install -y dbus-devel \
dejavu-sans-fonts fontconfig libXrandr-devel \
libXcursor-devel libXi-devel libXxf86vm-devel \
libXrandr-devel libXinerama-devel libXcomposite-devel mesa-libGLU-devel xz
RUN linux32 yum install -y libcap-devel libxkbcommon-devel
# it's okay to install X11 and friends from outdated centos repos because newer
# libs are dynamically loaded at runtime
RUN linux32 yum install -y zlib-devel dbus-devel fontconfig xz systemd-devel \
mesa-libGLU-devel libcap-devel libxkbcommon-devel \
libX11-devel libXext-devel libXrandr-devel libXcursor-devel libXfixes-devel \
libXi-devel libXScrnSaver-devel

# With this we
# 1) Force install prefix to /usr/local
Expand Down
15 changes: 6 additions & 9 deletions buildconfig/manylinux-build/docker_base/Dockerfile-x86_64
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,12 @@ RUN rpm --import /tmp/RPM-GPG-KEY.dag.txt

#RUN rpm -i /tmp/${RPMFORGE_FILE}

# Install SDL and portmidi dependencies
RUN yum install -y zlib-devel libX11-devel\
mesa-libGLU-devel audiofile-devel \
jpackage-utils \
giflib-devel dbus-devel \
dejavu-sans-fonts fontconfig \
libXcursor-devel libXi-devel libXxf86vm-devel \
libXrandr-devel libXinerama-devel libXcomposite-devel mesa-libGLU-devel xz
RUN yum install -y libcap-devel libxkbcommon-devel
# it's okay to install X11 and friends from outdated centos repos because newer
# libs are dynamically loaded at runtime
RUN yum install -y zlib-devel dbus-devel fontconfig xz systemd-devel \
mesa-libGLU-devel libcap-devel libxkbcommon-devel \
libX11-devel libXext-devel libXrandr-devel libXcursor-devel libXfixes-devel \
libXi-devel libXScrnSaver-devel

# With this we
# 1) Force install prefix to /usr/local
Expand Down
2 changes: 1 addition & 1 deletion buildconfig/manylinux-build/docker_base/alsa/alsa.sha512
Original file line number Diff line number Diff line change
@@ -1 +1 @@
79e5920384e570a1acd8ecd1eb8812879333c3cedb1d15780080afc40125b97df893c33f4163d9dd863871b628bc6026265f8ace2c8634fc1af5b52b62ac9cfe alsa-lib-1.2.7.2.tar.bz2
865ff05a8f589996f8d63d43a91c961f1b64144f3e1d17c7074b7ac16f25b3fd1c371d46ed63a8cc20fa01e63c76b75f1a9802b56889ae1073854dd050d27688 alsa-lib-1.2.8.tar.bz2
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ set -e -x

cd $(dirname `readlink -f "$0"`)

ALSA=alsa-lib-1.2.7.2
ALSA=alsa-lib-1.2.8
curl -sL https://www.alsa-project.org/files/pub/lib/${ALSA}.tar.bz2 > ${ALSA}.tar.bz2
sha512sum -c alsa.sha512

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ set -e -x

cd $(dirname `readlink -f "$0"`)

FLAC=flac-1.3.4
FLAC=flac-1.4.2

curl -sL --retry 10 http://downloads.xiph.org/releases/flac/${FLAC}.tar.xz > ${FLAC}.tar.xz
sha512sum -c flac.sha512
Expand Down
2 changes: 1 addition & 1 deletion buildconfig/manylinux-build/docker_base/flac/flac.sha512
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4a626e8a1bd126e234c0e5061e3b46f3a27c2065fdfa228fd8cf00d3c7fa2c05fafb5cec36acce7bfce4914bfd7db0b2a27ee15decf2d8c4caad630f62d44ec9 flac-1.3.4.tar.xz
20bdf0990a7432ac765037764bc8733a0d5646866fe6cc6f4868152d2a051c89676e501012ae489c7f87b3aacb45a5b30265afaca164cf0cf53ac058644a74c5 flac-1.4.2.tar.xz
Original file line number Diff line number Diff line change
Expand Up @@ -3,27 +3,14 @@ set -e -x

cd $(dirname `readlink -f "$0"`)

FSYNTH_VER="2.2.8"
FSYNTH_VER="2.3.1"
FSYNTH="fluidsynth-$FSYNTH_VER"

curl -sL --retry 10 https://github.com/FluidSynth/fluidsynth/archive/v${FSYNTH_VER}.tar.gz > ${FSYNTH}.tar.gz
sha512sum -c fluidsynth.sha512
tar xzf ${FSYNTH}.tar.gz

cd $FSYNTH

# This hack is only needed for fluidsynth 2.2.x and can be removed once
# fluidsynth is updated and https://github.com/FluidSynth/fluidsynth/pull/978
# makes it to a release.
# Currently fluidsynth uses non-standard LIB_INSTALL_DIR instead of
# CMAKE_INSTALL_LIBDIR, but we set the latter.
if [[ "$OSTYPE" == "linux-gnu"* ]]; then
sed -i 's/LIB_INSTALL_DIR/CMAKE_INSTALL_LIBDIR/g' CMakeLists.txt src/CMakeLists.txt
elif [[ "$OSTYPE" == "darwin"* ]]; then
# the -i flag on mac sed expects some kind of suffix (otherwise it errors)
sed -i '' 's/LIB_INSTALL_DIR/CMAKE_INSTALL_LIBDIR/g' CMakeLists.txt src/CMakeLists.txt
fi

mkdir build
cd build

Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
8173f2d368a214cf1eb7faae2f6326db43fb094ec9c83e652f953290c3f29c34ebd0b92cbb439bea8d814d3a7e4f9dc0c18c648df1d414989d5d8b4700c79535 fluidsynth-2.2.8.tar.gz
1633294bf6c714361c381151b62d9dd2c8f388490153e7964bfa14fd647a681db9ebfe1de0a06279972d6c5b30377f67361feb4db186b1faa235600f0ae02b22 fluidsynth-2.3.1.tar.gz
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ set -e -x

cd $(dirname `readlink -f "$0"`)

FREETYPE=freetype-2.12.1
HARFBUZZ_VER=5.1.0
FREETYPE="freetype-2.13.0"
HARFBUZZ_VER=7.1.0
HARFBUZZ_NAME="harfbuzz-$HARFBUZZ_VER"

curl -sL --retry 10 http://download.savannah.gnu.org/releases/freetype/${FREETYPE}.tar.gz > ${FREETYPE}.tar.gz
Expand Down
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
4f923c82121940e866022c1ee6afb97f447b83ab8b54188df169029f37589e3bad0768a3bfb3095982804db1eec582f05aa846dfb32639697e231af8d52676cc freetype-2.12.1.tar.gz
452c4236ef997db2a32c5ac32d3b619c5fa9b5691cde935092b32581387de8d161ab1ba78dd9fa02c36ce553f0f1fdd5564132ec81cd7b863af6d3be96cbf979 harfbuzz-5.1.0.tar.xz
0d2bfc3980313e1578b69568394666e1721c11dfdb47f21cb46ced48d0afcc674e175391ee0f64ffbcee814cded2d9a8fe6273029253c1adf642078ac8c0dd73 freetype-2.13.0.tar.gz
2f15bf14f927263c34201dba067ffac84133610121c58843c566d6f271f30f1dce44832a65bceb83828e25e9dd1a1d2a1610c5dbe2bef3ddbcecd7b5bcab8714 harfbuzz-7.1.0.tar.xz
21 changes: 0 additions & 21 deletions buildconfig/manylinux-build/docker_base/libjpeg/build-jpeg.sh

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ set -e -x

cd $(dirname `readlink -f "$0"`)

PNG=libpng-1.6.37
PNG=libpng-1.6.39

curl -sL --retry 10 http://download.sourceforge.net/libpng/${PNG}.tar.gz > ${PNG}.tar.gz
sha512sum -c png.sha512
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2ce2b855af307ca92a6e053f521f5d262c36eb836b4810cb53c809aa3ea2dcc08f834aee0ffd66137768a54397e28e92804534a74abb6fc9f6f3127f14c9c338 libpng-1.6.37.tar.gz
19851afffbe2ffde62d918f7e9017dec778a7ce9c60c75cdc65072f086e6cdc9d9895eb7b207535a84cb5f4ead77ebc2aa9d80025f153662903023e1f7ab9bae libpng-1.6.39.tar.gz
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ set -e -x

cd $(dirname `readlink -f "$0"`)

TIFF=tiff-4.4.0
TIFF=tiff-4.5.0

curl -sL --retry 10 https://download.osgeo.org/libtiff/${TIFF}.tar.gz > ${TIFF}.tar.gz
sha512sum -c tiff.sha512
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
78ffab7667d0feb8d38571bc482390fc6dd20b93a798ab3a8b5cc7d5ab00b44a37f67eb8f19421e4ab33ad89ab40e382128f8a4bbdf097e0efb6d9fca5ac6f9e tiff-4.4.0.tar.gz
02b94e355ac96ac2ecce717aff2b1e04b1bfe95bcd0cfa72e09cbd580c45de0afe341170daad0cf560064b5a8910b3e56ef260484c69919bb0545df90abe7fa9 tiff-4.5.0.tar.gz
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ set -e -x

cd $(dirname `readlink -f "$0"`)

WEBP=libwebp-1.2.2
WEBP=libwebp-1.3.0

curl -sL --retry 10 http://storage.googleapis.com/downloads.webmproject.org/releases/webp/${WEBP}.tar.gz > ${WEBP}.tar.gz
sha512sum -c webp.sha512
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0dd0a721352b513a218d55383bcd0cc45b786df8089f70f87257b5dcc0c4e2f1798e20f1ca98b8fe51710abb667f9c4c14f20f980a11c484c8832f0dc66e3bff libwebp-1.2.2.tar.gz
5af6999654e9ba3189574158c194396e3ad7b7d5061abf2711a7c93558a5898cd99adccd1c051e9a7910beb915fba8e703d33e7b6f06753b6f68c009c0e0d2bc libwebp-1.3.0.tar.gz
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ set -e -x

cd $(dirname `readlink -f "$0"`)

MPG123="mpg123-1.30.2"
MPG123="mpg123-1.31.3"

curl -sL --retry 10 https://downloads.sourceforge.net/sourceforge/mpg123/${MPG123}.tar.bz2 > ${MPG123}.tar.bz2
sha512sum -c mpg123.sha512
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
e2e9279799f3917c9ecbcb2ccdc2c246bda50317dbfdd7ba3d56281b7b4f5b1928442fc8e712fbf90543159afc703d1ab8ceb7e3c1c038e1547b82d1616bdc82 mpg123-1.30.2.tar.bz2
5dd550e06f5d0d432cac1b7e546215e56378b44588c1a98031498473211e08bc4228de45be41f7ba764f7f6c0eb752a6501235bcc3712c9a8d8852ae3c607d98 mpg123-1.31.3.tar.bz2
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ set -e -x

cd $(dirname `readlink -f "$0"`)

PORTMIDI_VER="2.0.3"
PORTMIDI_VER="2.0.4"
PORTMIDI="portmidi-${PORTMIDI_VER}"

curl -sL --retry 10 https://github.com/PortMidi/portmidi/archive/refs/tags/v${PORTMIDI_VER}.tar.gz> ${PORTMIDI}.tar.gz
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ed9a632dc3be35b5e3e48e2f4eb74d8794c993bb8e6f2686bea2fce611d3123ef1d3cc5abf212310022b5c4a19dd61efd0f2ce53611f4fe1a52026187c49e8f1 portmidi-2.0.3.tar.gz
d9f22d161e1dd9a4bde1971bb2b6e5352da51545f4fe5ecad11c55e7a535f0d88efce18d1c8fd91e93b70a7926150f86a0f53972ad92370e86556a8dd72dc194 portmidi-2.0.4.tar.gz
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ set -e -x

cd $(dirname `readlink -f "$0"`)

SDL2="SDL2-2.0.22"
SDL2="SDL2-2.26.4"
IMG2="SDL2_image-2.0.5"
TTF2="SDL2_ttf-2.20.1"
MIX2="SDL2_mixer-2.6.2"
TTF2="SDL2_ttf-2.20.2"
MIX2="SDL2_mixer-2.6.3"


# Download
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
ca4b690433cd4d9d73b797da98666317128e7e817ab60e874a49d94791ea41e8a6b4fc43649593120daa0702190c0f8a6ed326c908d87375c8da9f369d994f6a SDL2-2.0.22.tar.gz
138f52a23d796803c450722c8a4db8226214522e99f1e5ae657e2b28eb45abf0c81c9c3df9ab16f1a07d59722ed9415d64dd04332ff040cdfbbc0329f0d05ce4 SDL2-2.26.4.tar.gz
77e743d3f32707e015b290c1379ae3c7d7a3fe265995713267f0d0ec6517de4808f0de9890b5ab28445941af5bc9fbff346620629e0d7d7e9f365262cab05ee7 SDL2_image-2.0.5.tar.gz
16baa9d8b345bf0224538cbfb2ae9fc5d3deea2b454f41a98006c938fe7a65d5a8c84e28a76f98a4dd971c4fe5cf0219d8bf73331cf11f2702e01600eb197658 SDL2_mixer-2.6.2.tar.gz
5745a318583a771dff30421d79c5940bdb0fe2f8908a0192e98a2a80076722ba53f6488e922de5b49e078f0c7d9d358e681886ebc8862d89ca6671b5be471134 SDL2_ttf-2.20.1.tar.gz

2e9da045d2fdab97236c3901b3d441834a67a47c8851ddfb817c9db6f23ed9fb355a5ef8d2158d0c9959a83934e8cd1b95db8a69eaddf8f7fcca115f01818740 SDL2_mixer-2.6.3.tar.gz
b54e93b100712e3764cd80d4e4b16cd4c2a6853620f675941a4214320b0ee29a583d57ad56cd5fdb5c7a32d7615cbf43bc3fa55337b01623cee7219ebb43667c SDL2_ttf-2.20.2.tar.gz
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ set -e -x

cd $(dirname `readlink -f "$0"`)

SNDFILEVER=1.1.0
SNDFILEVER=1.2.0
SNDNAME="libsndfile-$SNDFILEVER"
SNDFILE="$SNDNAME.tar.xz"
curl -sL --retry 10 https://github.com/libsndfile/libsndfile/releases/download/${SNDFILEVER}/${SNDFILE} > ${SNDFILE}
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
d01696a8a88a4444e5eb91a137cf7b26b55b12c1fe3b648653f7e78674bbdf61870066216c9ff2f6a1e63bdf7b558af9a759480cf6523b607d29347b12762006 libsndfile-1.1.0.tar.xz
c0dee6b33cd3c619aa13ec2854a5480e826640ca98a438758346194e83752af576a39f9de118824f0d0c61288632d87b489dc5793c025296e0f15564d87ca12a libsndfile-1.2.0.tar.xz
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ set -e -x

cd $(dirname `readlink -f "$0"`)

ZLIB_NG_VER=2.0.6
ZLIB_NG_VER=2.0.7
ZLIB_NG_NAME="zlib-ng-$ZLIB_NG_VER"
curl -sL --retry 10 https://github.com/zlib-ng/zlib-ng/archive/refs/tags/${ZLIB_NG_VER}.tar.gz > ${ZLIB_NG_NAME}.tar.gz

Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4888f17160d0a87a9b349704047ae0d0dc57237a10e11adae09ace957afa9743cce5191db67cb082991421fc961ce68011199621034d2369c0e7724fad58b4c5 zlib-ng-2.0.6.tar.gz
1c19a62bb00727ac49049c299fb70060da95b5fafa448144ae4133372ec8c3da15cef6c1303485290f269b23c580696554ca0383dba3e1f9609f65c332981988 zlib-ng-2.0.7.tar.gz