Skip to content

Commit 40e7671

Browse files
Starbuck5Starbuck5
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

‎buildconfig/manylinux-build/docker_base/alsa/alsa.sha512

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

‎buildconfig/manylinux-build/docker_base/fluidsynth/fluidsynth.sha512

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

‎buildconfig/manylinux-build/docker_base/freetype/freetype.sha512

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
ada47d020511069e4e62745c7da767aab4a979a52d74a9802c09c102ea7a86dbb81351fc7e9ed41c23748be45f5937c91e61cc5107650ddd78cbd900d82bd28f freetype-2.13.2.tar.gz
2-
8f4aeb5528cb4f74facda89eb9828ccf491d577450ccdd71c331c943edf56303fa73a077d6b620687ae1ba21564aa02e202dbae98b77ac0947bc45e044c05f67 harfbuzz-8.2.1.tar.xz
1+
b7e7e67baed421dbe08c48dcde5d5891c0f7e3c1253be8dc27826c60eaa17ca89f888c3d5a6faf5141b02c154e1cf42d4ed6133b9959ddc359fe6bd41615ae89 freetype-2.13.3.tar.gz
2+
3fb7dda6e51496337698d46cebe623f678a4e5b0f006be6e1309143a82408a362c149812477e083e14811a5cba565d76eb2c0804f5e1bbea7e1bf83678176048 harfbuzz-10.0.1.tar.xz

‎buildconfig/manylinux-build/docker_base/libffi/build-libffi.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-
LIBFFI_VER="3.4.4"
6+
LIBFFI_VER="3.4.6"
77
LIBFFI="libffi-$LIBFFI_VER"
88

99
curl -sL --retry 10 https://github.com/libffi/libffi/releases/download/v${LIBFFI_VER}/${LIBFFI}.tar.gz > ${LIBFFI}.tar.gz

‎buildconfig/manylinux-build/docker_base/libffi/libffi.sha512

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
88680aeb0fa0dc0319e5cd2ba45b4b5a340bc9b4bcf20b1e0613b39cd898f177a3863aa94034d8e23a7f6f44d858a53dcd36d1bb8dee13b751ef814224061889 libffi-3.4.4.tar.gz
1+
033d2600e879b83c6bce0eb80f69c5f32aa775bf2e962c9d39fbd21226fa19d1e79173d8eaa0d0157014d54509ea73315ad86842356fc3a303c0831c94c6ab39 libffi-3.4.6.tar.gz

‎buildconfig/manylinux-build/docker_base/libjpegturbo/build-jpeg-turbo.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-
JPEG_VERSION=3.0.0
6+
JPEG_VERSION=3.0.4
77
JPEG="libjpeg-turbo-${JPEG_VERSION}"
88

99
curl -sL --retry 10 https://github.com/libjpeg-turbo/libjpeg-turbo/archive/refs/tags/${JPEG_VERSION}.tar.gz > ${JPEG}.tar.gz

‎buildconfig/manylinux-build/docker_base/libjpegturbo/libjpegturbo.sha512

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0efb7ce16333f4f3556b889bdd83b0f91697ce1645cbfb13db0c8a93ef47dd9cb0805c7160edaf946d4d54faf30a33bae90800c189e8b4bd44fcf3ce98179115 libjpeg-turbo-3.0.0.tar.gz
1+
f43e1b6b9d048e29e381796c71e1c34a04c0f1c52c1f462db9f9930cfc75d69a50861be2570a6a4adc26a4183b6601300fd9d5553c06bc042f0d32fc1e408ed9 libjpeg-turbo-3.0.4.tar.gz

‎buildconfig/manylinux-build/docker_base/libpipewire/build-libpipewire.sh

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

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

6-
# use pinned commit (latest at the time of this comment) as 1.0.3 has compilation issues
7-
PIPEWIRE_VER="0cfe57f33d4a6e511577614e97c7491e6450f0eb" # 1.0.3
6+
PIPEWIRE_VER="1.2.4"
87
PIPEWIRE="pipewire-$PIPEWIRE_VER"
98

109
curl -sL --retry 10 https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/${PIPEWIRE_VER}/${PIPEWIRE}.tar.gz > ${PIPEWIRE}.tar.gz

‎buildconfig/manylinux-build/docker_base/libpipewire/libpipewire.sha512

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
6ed0a6a140963a6c7b2bb53c8060ecbf5ede9514212d81f71bcbcc1edf685a7bb8f4bc57f43f8bef3590db392bd0bfb97b0670f2e365590c311f77d6ed8396b9 pipewire-0cfe57f33d4a6e511577614e97c7491e6450f0eb.tar.gz
1+
8a5b14cb99846635d080adc9e257c59dd4ab8e84e0751d71d3371505de89d19b1769cb12020d8a45808676d625226cd07aa30544050097e5f9540c6e37e4f97e pipewire-1.2.4.tar.gz

‎buildconfig/manylinux-build/docker_base/libpng/build-png.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-
PNG=libpng-1.6.40
6+
PNG=libpng-1.6.44
77

88
curl -sL --retry 10 http://download.sourceforge.net/libpng/${PNG}.tar.gz > ${PNG}.tar.gz
99
sha512sum -c png.sha512

‎buildconfig/manylinux-build/docker_base/libpng/png.sha512

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
e27c61cb8fecd2550ca742aad68560f83bcc5123875f6727c2992258212bd342020e35a0ed95de6c2a2ca3f388f3afe1da7965e98650df3a0b9c5726c8334f95 libpng-1.6.40.tar.gz
1+
84a58ebb15df69b306b1822a9741cbff0d0e15d60a0978d831a8f9dee03b21df7cbc695102d6c135134f3daa8a0a7f050a890cd545bea102c078ba4520666e78 libpng-1.6.44.tar.gz

‎buildconfig/manylinux-build/docker_base/libtiff/build-tiff.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-
TIFF=tiff-4.6.0
6+
TIFF=tiff-4.7.0
77

88
curl -sL --retry 10 https://download.osgeo.org/libtiff/${TIFF}.tar.gz > ${TIFF}.tar.gz
99
sha512sum -c tiff.sha512

‎buildconfig/manylinux-build/docker_base/libtiff/tiff.sha512

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
80a117780fe5e2519b5c6661efa90a8a1e4591eb6300068b611ff9887285641c0782d9835482f589d6d109c3be6ffab8831c3561bb40e2456258deb1e896f08e tiff-4.6.0.tar.gz
1+
a77a050d1d8777c6d86077c3c26e8d35f98717fe14bb3c049e2b82fbfbb374e96f83a0c1ff67ffb21591a9a7abf0d3e18c3d7695c96939326cc19a9712dd2492 tiff-4.7.0.tar.gz

‎buildconfig/manylinux-build/docker_base/libwebp/build-webp.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-
WEBP=libwebp-1.3.2
6+
WEBP=libwebp-1.4.0
77

88
curl -sL --retry 10 http://storage.googleapis.com/downloads.webmproject.org/releases/webp/${WEBP}.tar.gz > ${WEBP}.tar.gz
99
sha512sum -c webp.sha512

‎buildconfig/manylinux-build/docker_base/libwebp/webp.sha512

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2b624d2ecfbff6b4db2719e38f146722638ae262acd96327073a04451dd05fb27ef70c5681187821d251df728a6be7e89209c861c561a13bfb786495a830bc20 libwebp-1.3.2.tar.gz
1+
1217363fbb5c860b17c2ba4612f240f121c74ced6e3e58e8aa61252a9022f59893c5874bfa433cc50a7e65bac1ae2bfa99fa2cede070183b7a467f148cebb0bd libwebp-1.4.0.tar.gz

‎buildconfig/manylinux-build/docker_base/libxml2/build-libxml2.sh

Lines changed: 2 additions & 2 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-
LIBXML2_VER=2.11
7-
LIBXML2_PATCH=7
6+
LIBXML2_VER=2.13
7+
LIBXML2_PATCH=4
88
LIBXML2="libxml2-$LIBXML2_VER.$LIBXML2_PATCH"
99

1010
curl -sL --retry 10 https://download.gnome.org/sources/libxml2/${LIBXML2_VER}/${LIBXML2}.tar.xz > ${LIBXML2}.tar.xz

‎buildconfig/manylinux-build/docker_base/libxml2/libxml2.sha512

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
202b0523d982eb5269dcb4644d8ab2ea31404771069462cdd6c5cd7e6672e0e50371ceb334133bb8f2c0a42f133e8f40c3f582bba5fc71ab168a2b18d4cfd81d libxml2-2.11.7.tar.xz
1+
27bfaa63431798d3aa725b36af2005bda70a20b270e601cc3c8a07cc9fd02a080cb3d2b023eb42606a57b9786469488a7c09b71bdff1a518a0b4271c78c3f940 libxml2-2.13.4.tar.xz

‎buildconfig/manylinux-build/docker_base/libxmp/build-libxmp.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ sha512sum -c libxmp.sha512
1313
tar xzf ${XMP}.tar.gz
1414
cd ${XMP}
1515

16-
cmake . $PG_BASE_CMAKE_FLAGS
16+
cmake . $PG_BASE_CMAKE_FLAGS -DLIBXMP_PIC=1
1717

1818
make
1919
make install

‎buildconfig/manylinux-build/docker_base/mesa/glslang/build-glslang.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-
GLSLANG_VER=14.0.0
6+
GLSLANG_VER=14.3.0
77
GLSLANG="glslang-$GLSLANG_VER"
88
curl -sL --retry 10 https://github.com/KhronosGroup/glslang/archive/refs/tags/${GLSLANG_VER}.tar.gz > ${GLSLANG}.tar.gz
99

‎buildconfig/manylinux-build/docker_base/mesa/glslang/glslang.sha512sum

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
45ec1a23a390319b9270761cf8befb832ac8b4bc215b211c41a543553a97e5ccf17c134c34d8fdbed6efe887a9a7c2f0a955d1bfe1add9e04cc3e95b12e1973a glslang-14.0.0.tar.gz
1+
ce6d09cc4d98b01d162ec5a196eec017c4a5f25eaf98c6612695d911f8d136c2f7193ff8f2c07931b2e94182d2c654833adc3b645f0c225e1d07c4e6e7abfd76 glslang-14.3.0.tar.gz

‎buildconfig/manylinux-build/docker_base/mesa/libdrm/build-libdrm.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ cd $(dirname `readlink -f "$0"`)
66
# The drm already available on manylinux docker images is too old for mesa, so
77
# we need to compile the latest from source
88

9-
DRM_VER="libdrm-2.4.120"
9+
DRM_VER="libdrm-2.4.123"
1010
DRM="drm-$DRM_VER"
1111

1212
curl -sL --retry 10 https://gitlab.freedesktop.org/mesa/drm/-/archive/$DRM_VER/$DRM.tar.gz > $DRM.tar.gz

‎buildconfig/manylinux-build/docker_base/mesa/libdrm/libdrm.sha512sum

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
31428ec49476af3bb7acbe088ebb2411f2f69013af63afd0832546df1a45a7f45ebb472dce3f07946b9202e41deba7aae3590c2e721c56b6d64de908704ae308 drm-libdrm-2.4.120.tar.gz
1+
b593eb26be0f4e3aac44dfe8ec4e37d9e1a2666f9c86f2dcd3c32bd3e6fe376bfce7bd1c47af4d39b85b3d6f43ebf12f02704f055106872fb35f1d85b45286f3 drm-libdrm-2.4.123.tar.gz

‎buildconfig/manylinux-build/docker_base/mesa/mako/build-mako.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ set -e -x
44
cd $(dirname `readlink -f "$0"`)
55

66
# pin for build stability, remember to keep updated
7-
python3 -m pip install mako==1.3.2
7+
python3 -m pip install mako==1.3.5 PyYAML==6.0.2

‎buildconfig/manylinux-build/docker_base/mesa/mesa/build-mesa.sh

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ cd $(dirname `readlink -f "$0"`)
77
# wayland driver needs this) and glx (SDL needs it)
88
# we don't support vulkan yet
99

10-
MESA_VER="mesa-24.0.1"
10+
MESA_VER="mesa-24.2.3"
1111
MESA="mesa-$MESA_VER" # yes mesa comes twice in the name
1212

1313
curl -sL --retry 10 https://gitlab.freedesktop.org/mesa/mesa/-/archive/$MESA_VER/$MESA.tar.gz > $MESA.tar.gz
@@ -16,17 +16,7 @@ sha512sum -c mesa.sha512sum
1616
tar xzf $MESA.tar.gz
1717
cd $MESA
1818

19-
# For now, we don't compile in LLVM because of its weight. Because of this, we
20-
# can't compile in support for the radeonsi driver
21-
if [ `uname -m` == "aarch64" ]; then
22-
# On aarch64 we allow mesa to use all drivers it wants to pick by default
23-
# (because radeonsi is not used on arm platforms)
24-
GALLIUM_DRIVERS="auto"
25-
else
26-
# all default except radeonsi
27-
GALLIUM_DRIVERS="r300,r600,nouveau,virgl,svga,swrast,iris,crocus,i915"
28-
fi
29-
30-
# build with meson+ninja
31-
meson build/ $PG_BASE_MESON_FLAGS -Dgallium-drivers=$GALLIUM_DRIVERS -Dvulkan-drivers=[]
19+
# build with meson+ninja, a very minimal install will do because this is not actually
20+
# being installed in the wheel
21+
meson build/ $PG_BASE_MESON_FLAGS -Dgallium-drivers=softpipe -Dvulkan-drivers=[]
3222
ninja -C build/ install

‎buildconfig/manylinux-build/docker_base/mesa/mesa/mesa.sha512sum

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
66a6cea1712f3b20744c0865c10523313653be39fc5a75e8201dbf50188cad819bd52a6013d1bd7be3d622de948b750ceb41dc73649cdea2abbaa6bb016cc4a7 mesa-mesa-24.0.1.tar.gz
1+
be99f38318509a864212c600a8b14e9615ef7d2cfbda8d020b0059585d05dcb850601200a139b2adaf04d8d7df9c4e2661014fafab15647f3d02e3db1196c998 mesa-mesa-24.2.3.tar.gz

‎buildconfig/manylinux-build/docker_base/mpg123/build-mpg123.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-
MPG123="mpg123-1.32.1"
6+
MPG123="mpg123-1.32.7"
77

88
curl -sL --retry 10 https://downloads.sourceforge.net/sourceforge/mpg123/${MPG123}.tar.bz2 > ${MPG123}.tar.bz2
99
sha512sum -c mpg123.sha512

‎buildconfig/manylinux-build/docker_base/mpg123/mpg123.sha512

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
084f4575d3ad88373a04035778b40e4871b6da969f42b426c76d9539632baa12534d7f0f9b976be228fd313dea9c31f7a259e0a8b56d044c7e89fefdf897def2 mpg123-1.32.1.tar.bz2
1+
71f7cf6035c489934400528d0eaf0c1104417867990dd0abcc99c682818ef1f3e99dbee9dcdd888d88ed172a8950d5df515b755a5c1c1b54fc56a28584ceef8c mpg123-1.32.7.tar.bz2

‎buildconfig/manylinux-build/docker_base/ogg/build-ogg.sh

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,7 @@ sha512sum -c ogg.sha512
1313
tar xzf ${OGG}.tar.gz
1414
cd $OGG
1515

16-
if [[ "$OSTYPE" == "linux-gnu"* ]]; then
17-
./configure $PG_BASE_CONFIGURE_FLAGS
18-
elif [[ "$OSTYPE" == "darwin"* ]]; then
19-
# Use CMake on macOS because ./configure doesn't generate dylib
20-
cmake . $PG_BASE_CMAKE_FLAGS
21-
fi
22-
16+
cmake . $PG_BASE_CMAKE_FLAGS
2317
make
2418
make install
2519

@@ -28,11 +22,6 @@ cd ..
2822
tar xzf ${VORBIS}.tar.gz
2923
cd $VORBIS
3024

31-
if [[ "$OSTYPE" == "linux-gnu"* ]]; then
32-
./configure $PG_BASE_CONFIGURE_FLAGS
33-
elif [[ "$OSTYPE" == "darwin"* ]]; then
34-
# Use CMake on macOS because ./configure doesn't generate dylib
35-
cmake . $PG_BASE_CMAKE_FLAGS
36-
fi
25+
cmake . $PG_BASE_CMAKE_FLAGS
3726
make
3827
make install

‎buildconfig/manylinux-build/docker_base/opus/build-opus.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-
OPUS=opus-1.4
6+
OPUS=opus-1.5.2
77
OPUS_FILE=opusfile-0.12
88

99
curl -sL --retry 10 http://downloads.xiph.org/releases/opus/${OPUS}.tar.gz > ${OPUS}.tar.gz

‎buildconfig/manylinux-build/docker_base/opus/opus.sha512

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
1ecd39e0add24de12823bf7c936bb67441228721e2cdae0edbfcf3cee0894bcc6edf2a1d0ca5cdfdad1565803bf39cc4c985ad32710c2a9582f850adeb5ca631 opus-1.4.tar.gz
1+
78d963cd56d5504611f111e2b3606e236189a3585d65fae1ecdbec9bf4545632b1956f11824328279a2d1ea2ecf441ebc11e455fb598d20a458df15185e95da4 opus-1.5.2.tar.gz
22
e25e6968a3183ac0628ce1000840fd6f9f636e92ba984d6a72b76fb2a98ec632d2de4c66a8e4c05ef30655c2a4a13ab35f89606fa7d79a54cfa8506543ca57af opusfile-0.12.tar.gz

0 commit comments

Comments
 (0)