Bump glib to latest version (and build with meson)

pygame-community · Nov 7, 2023 · 217009d · 217009d
1 parent 0cbbe19
commit 217009d
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 36 deletions.
diff --git a/buildconfig/macdependencies/build_mac_deps.sh b/buildconfig/macdependencies/build_mac_deps.sh
@@ -95,8 +95,8 @@ bash mpg123/build-mpg123.sh
 bash opus/build-opus.sh # needs libogg (which is a container format)
 
 # fluidsynth (for sdl_mixer)
-bash gettext/build-gettext.sh
-bash glib/build-glib.sh # depends on gettext
+# bash gettext/build-gettext.sh
+bash glib/build-glib.sh
 bash sndfile/build-sndfile.sh
 bash fluidsynth/build-fluidsynth.sh
 

diff --git a/buildconfig/macdependencies/clean_usr_local.sh b/buildconfig/macdependencies/clean_usr_local.sh
@@ -29,7 +29,7 @@ rm -rf /usr/local/Cellar/libtiff
 rm -rf /usr/local/Cellar/libsndfile
 rm -rf /usr/local/Cellar/glib
 rm -rf /usr/local/Cellar/brotli
-rm -rf /usr/local/Cellar/pcre
+rm -rf /usr/local/Cellar/pcre*
 rm -rf /usr/local/Cellar/opusfile
 rm -rf /usr/local/Cellar/opus
 rm -rf /usr/local/Cellar/freetype

diff --git a/buildconfig/manylinux-build/docker_base/Dockerfile-aarch64 b/buildconfig/manylinux-build/docker_base/Dockerfile-aarch64
@@ -97,8 +97,9 @@ RUN ["bash", "/libmodplug_build/build-libmodplug.sh"]
 ADD libffi /libffi_build/
 RUN ["bash", "/libffi_build/build-libffi.sh"]
 
-ADD gettext /gettext_build/
-RUN ["bash", "/gettext_build/build-gettext.sh"]
+# explicit install not needed anymore
+# ADD gettext /gettext_build/
+# RUN ["bash", "/gettext_build/build-gettext.sh"]
 
 ADD glib /glib_build/
 RUN ["bash", "/glib_build/build-glib.sh"]

diff --git a/buildconfig/manylinux-build/docker_base/Dockerfile-i686 b/buildconfig/manylinux-build/docker_base/Dockerfile-i686
@@ -97,8 +97,9 @@ RUN ["linux32", "bash", "/libmodplug_build/build-libmodplug.sh"]
 ADD libffi /libffi_build/
 RUN ["bash", "/libffi_build/build-libffi.sh"]
 
-ADD gettext /gettext_build/
-RUN ["bash", "/gettext_build/build-gettext.sh"]
+# explicit install not needed anymore
+# ADD gettext /gettext_build/
+# RUN ["bash", "/gettext_build/build-gettext.sh"]
 
 ADD glib /glib_build/
 RUN ["bash", "/glib_build/build-glib.sh"]

diff --git a/buildconfig/manylinux-build/docker_base/Dockerfile-x86_64 b/buildconfig/manylinux-build/docker_base/Dockerfile-x86_64
@@ -97,8 +97,9 @@ RUN ["bash", "/libmodplug_build/build-libmodplug.sh"]
 ADD libffi /libffi_build/
 RUN ["bash", "/libffi_build/build-libffi.sh"]
 
-ADD gettext /gettext_build/
-RUN ["bash", "/gettext_build/build-gettext.sh"]
+# explicit install not needed anymore
+# ADD gettext /gettext_build/
+# RUN ["bash", "/gettext_build/build-gettext.sh"]
 
 ADD glib /glib_build/
 RUN ["bash", "/glib_build/build-glib.sh"]

diff --git a/buildconfig/manylinux-build/docker_base/glib/build-glib.sh b/buildconfig/manylinux-build/docker_base/glib/build-glib.sh
@@ -3,21 +3,21 @@ set -e -x
 
 cd $(dirname `readlink -f "$0"`)
 
-GLIB=glib-2.56.4
+GLIB_VER="2.78"
+GLIB_PATCH="1"
+GLIB="glib-${GLIB_VER}.${GLIB_PATCH}"
 
-curl -sL --retry 10 https://download.gnome.org/sources/glib/2.56/${GLIB}.tar.xz > ${GLIB}.tar.xz
+curl -sL --retry 10 https://download.gnome.org/sources/glib/${GLIB_VER}/${GLIB}.tar.xz > ${GLIB}.tar.xz
 sha512sum -c glib.sha512
 
 unxz ${GLIB}.tar.xz
 tar xf ${GLIB}.tar
 cd $GLIB
 
-if [[ "$MAC_ARCH" == "arm64" ]]; then
-    # pass a 'cache' file while cross compiling to arm64 for glib. This is
-    # needed for glib to determine some info about the target architecture
-    export GLIB_COMPILE_EXTRA_FLAGS="--cache-file=../macos_arm64.cache"
-fi
+# a minimal glib install will do for us
+meson _build $PG_BASE_MESON_FLAGS -Dtests=false \
+    -Dselinux=disabled -Dlibmount=disabled -Ddtrace=false -Dsystemtap=false -Dnls=disabled
+
+ninja -C _build
+ninja -C _build install
 
-CFLAGS=-Wno-error ./configure $PG_BASE_CONFIGURE_FLAGS --with-pcre=internal $GLIB_COMPILE_EXTRA_FLAGS --disable-libmount --disable-dbus
-make
-make install
diff --git a/buildconfig/manylinux-build/docker_base/glib/glib.sha512 b/buildconfig/manylinux-build/docker_base/glib/glib.sha512
@@ -1 +1 @@
-280a46c2af13283a08c15ff0b4f5492659c2884521930600ad45310ed181c44a878ad8f9b36bae68ed6e7d92db6f1630f7bf015148c513dc317d25807f13abb0  glib-2.56.4.tar.xz
+aa9ed9195951b00ac8221e958ea337fbda82621a862ef8f29dc2ea396a6253ce51c2a0a498dfa4e12642f1836f85f9564f09991979ae85c5ed4368355d857376  glib-2.78.1.tar.xz
diff --git a/buildconfig/manylinux-build/docker_base/glib/macos_arm64.cache b/buildconfig/manylinux-build/docker_base/glib/macos_arm64.cache
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		280a46c2af13283a08c15ff0b4f5492659c2884521930600ad45310ed181c44a878ad8f9b36bae68ed6e7d92db6f1630f7bf015148c513dc317d25807f13abb0 glib-2.56.4.tar.xz
		aa9ed9195951b00ac8221e958ea337fbda82621a862ef8f29dc2ea396a6253ce51c2a0a498dfa4e12642f1836f85f9564f09991979ae85c5ed4368355d857376 glib-2.78.1.tar.xz