Skip to content

Commit 40e7671

Browse files
authored
Merge pull request #3118 from pygame-community/ankith26-deps-updates2024
mac/manylinux deps updates 2024
2 parents 72239a2 + 0c40cd6 commit 40e7671

Some content is hidden

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

49 files changed

+115
-126
lines changed

buildconfig/manylinux-build/docker_base/Dockerfile-aarch64

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,9 @@ ENV PG_BASE_MESON_FLAGS="--prefix=$PG_DEP_PREFIX \
4040
# remember to keep this updated when we drop 3.11 support
4141
ENV PATH="/opt/python/cp311-cp311/bin:$PATH"
4242

43+
# libraries installed in dep prefix must be usable everywhere
44+
ENV LD_LIBRARY_PATH="$PG_DEP_PREFIX/lib:$LD_LIBRARY_PATH"
45+
4346
ADD pkg-config /pkg-config_build/
4447
RUN ["bash", "/pkg-config_build/build-pkg-config.sh"]
4548

buildconfig/manylinux-build/docker_base/Dockerfile-i686

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,9 @@ ENV PG_BASE_MESON_FLAGS="--prefix=$PG_DEP_PREFIX \
4040
# remember to keep this updated when we drop 3.11 support
4141
ENV PATH="/opt/python/cp311-cp311/bin:$PATH"
4242

43+
# libraries installed in dep prefix must be usable everywhere
44+
ENV LD_LIBRARY_PATH="$PG_DEP_PREFIX/lib:$LD_LIBRARY_PATH"
45+
4346
ADD pkg-config /pkg-config_build/
4447
RUN ["linux32", "bash", "/pkg-config_build/build-pkg-config.sh"]
4548

buildconfig/manylinux-build/docker_base/Dockerfile-x86_64

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,9 @@ ENV PG_BASE_MESON_FLAGS="--prefix=$PG_DEP_PREFIX \
4040
# remember to keep this updated when we drop 3.11 support
4141
ENV PATH="/opt/python/cp311-cp311/bin:$PATH"
4242

43+
# libraries installed in dep prefix must be usable everywhere
44+
ENV LD_LIBRARY_PATH="$PG_DEP_PREFIX/lib:$LD_LIBRARY_PATH"
45+
4346
ADD pkg-config /pkg-config_build/
4447
RUN ["bash", "/pkg-config_build/build-pkg-config.sh"]
4548

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4ccbd1dc5a612044571c26290923009e4c3f7959b30a5d0bed47daa68bbefaff9059c4f0fa3bc16f22c1eed2d36f079139369f40243da5921ae4de02a4541939 alsa-lib-1.2.10.tar.bz2
1+
053e36e51c0ff28f07028b89c8845b50682a5c14035ab85c2fc8cae2f2f0d05e4cd45ed879602c15c1596fb7fe84bfd50ec0d119dfb55c66589a2d458a9b317d alsa-lib-1.2.12.tar.bz2

buildconfig/manylinux-build/docker_base/alsa/build-alsa.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ set -e -x
33

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

6-
ALSA=alsa-lib-1.2.10
6+
ALSA=alsa-lib-1.2.12
77
curl -sL https://www.alsa-project.org/files/pub/lib/${ALSA}.tar.bz2 > ${ALSA}.tar.bz2
88
sha512sum -c alsa.sha512
99

buildconfig/manylinux-build/docker_base/buildtools/install.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ fi
1717

1818
# pin versions for stability (remember to keep updated)
1919
python3 -m pip install $PG_PIP_EXTRA_FLAGS \
20-
setuptools==68.2.2 cmake==3.27.6 meson==1.2.2 ninja==1.11.1
20+
setuptools==75.1.0 cmake==3.30.3 meson==1.5.2 ninja==1.11.1.1
2121

2222
if [[ "$OSTYPE" == "linux-gnu"* ]]; then
2323
cp /root/.local/bin/* /usr/bin

buildconfig/manylinux-build/docker_base/flac/build-flac.sh

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,17 @@ unxz ${FLAC}.tar.xz
1313
tar xf ${FLAC}.tar
1414
cd $FLAC
1515

16-
./configure $PG_BASE_CONFIGURE_FLAGS
16+
mkdir build
17+
cd build
18+
19+
# use cmake to try to catch the ogg dependency
20+
cmake .. $PG_BASE_CMAKE_FLAGS \
21+
-DBUILD_CXXLIBS=0 \
22+
-DBUILD_PROGRAMS=0 \
23+
-DBUILD_EXAMPLES=0 \
24+
-DBUILD_TESTING=0 \
25+
-DBUILD_DOCS=0 \
26+
-DINSTALL_MANPAGES=0
27+
1728
make
1829
make install

buildconfig/manylinux-build/docker_base/fluidsynth/build-fluidsynth.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ set -e -x
33

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

6-
FSYNTH_VER="2.3.4"
6+
FSYNTH_VER="2.3.6"
77
FSYNTH="fluidsynth-$FSYNTH_VER"
88

99
curl -sL --retry 10 https://github.com/FluidSynth/fluidsynth/archive/v${FSYNTH_VER}.tar.gz > ${FSYNTH}.tar.gz
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
79891116d78b9be1c38bce9e5759b9bb732c3d8ee31c6e57d1a3e2b5548879b91d19582e73ee7fb0fd243beba3bf1bbc341a26aab0b6440eef36fc55dce3e8b0 fluidsynth-2.3.4.tar.gz
1+
521e103e49c281ab7a44a2a275f614894062c1be6eb4df776b11e3756803c6b4b73d1e9596d364959c81b37dff4798d56798f9262c486e098f072ae1e7bef1c1 fluidsynth-2.3.6.tar.gz

buildconfig/manylinux-build/docker_base/freetype/build-freetype.sh

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ set -e -x
33

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

6-
FREETYPE="freetype-2.13.2"
7-
HARFBUZZ_VER=8.2.1
6+
FREETYPE="freetype-2.13.3"
7+
HARFBUZZ_VER=10.0.1
88
HARFBUZZ_NAME="harfbuzz-$HARFBUZZ_VER"
99

1010
curl -sL --retry 10 https://savannah.nongnu.org/download/freetype/${FREETYPE}.tar.gz > ${FREETYPE}.tar.gz
@@ -36,11 +36,12 @@ cd ${HARFBUZZ_NAME}
3636
# Cairo and chafa are only needed for harfbuzz commandline utilities so we
3737
# don't use it. glib available is a bit old so we don't prefer it as of now.
3838
# we also don't compile-in icu so that harfbuzz uses built-in unicode handling
39-
./configure $PG_BASE_CONFIGURE_FLAGS --with-freetype=yes \
40-
--with-cairo=no --with-chafa=no --with-glib=no --with-icu=no \
41-
--disable-static
42-
make
43-
make install
39+
meson setup _build $PG_BASE_MESON_FLAGS -Dfreetype=enabled \
40+
-Dglib=disabled -Dgobject=disabled -Dcairo=disabled -Dchafa=disabled -Dicu=disabled \
41+
-Dtests=disabled -Dintrospection=disabled -Ddocs=disabled
42+
43+
meson compile -C _build
44+
meson install -C _build
4445

4546
if [[ "$OSTYPE" == "darwin"* ]]; then
4647
# We do a little hack...
@@ -51,7 +52,6 @@ if [[ "$OSTYPE" == "darwin"* ]]; then
5152
# contains "freetype". This is fine for now when the harfbuzz we are
5253
# building has no other dependencies
5354
sed -i '' '/freetype/d' $PG_DEP_PREFIX/lib/pkgconfig/harfbuzz.pc
54-
sed -i '' 's/ [^ ]*libfreetype.la//g' $PG_DEP_PREFIX/lib/libharfbuzz.la
5555
fi
5656

5757
cd ..

0 commit comments

Comments
 (0)