From d4808d4916dab74e6ec758d54e3bef9bbf699de7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mos=C3=A8=20Giordano?= Date: Sun, 25 Feb 2024 18:54:21 +0000 Subject: [PATCH] [PulseAudio] Rebuild with OpenSSL v3 (#8168) * [PulseAudio] Rebuild with OpenSSL v3 * [PulseAudio] Disable tests * [PulseAudio] Disable armv6l --- P/PulseAudio/build_tarballs.jl | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/P/PulseAudio/build_tarballs.jl b/P/PulseAudio/build_tarballs.jl index 2f473a09552..e0bc11767e3 100644 --- a/P/PulseAudio/build_tarballs.jl +++ b/P/PulseAudio/build_tarballs.jl @@ -3,7 +3,7 @@ using BinaryBuilder, Pkg name = "PulseAudio" -version = v"15.0.0" +version = v"15.0.1" short_version = "$(version.major).$(version.minor)" @@ -15,14 +15,10 @@ sources = [ # Bash recipe for building across all platforms script = raw""" -cd $WORKSPACE/srcdir +cd $WORKSPACE/srcdir/pulseaudio-* apk update apk add bash-completion doxygen gettext glib orc-compiler perl-xml-parser -# make sure meson can find everything -sed -i -e "s~c_args = .*~c_args = ['-I${includedir}', '-L${libdir}']~" ${MESON_TARGET_TOOLCHAIN} -# For some reason, librt fails to get linked correctly, so add a flag sed -i -e "s~c_link_args = .*~c_link_args = ['-lrt']~" ${MESON_TARGET_TOOLCHAIN} -cd pulseaudio-* # make rpath work with cross compilation atomic_patch -p2 $WORKSPACE/srcdir/patches/rpath.patch # disable fastmath @@ -35,16 +31,16 @@ mkdir build cd build # optional dependencies I can't build but might be useful # Avahi Jack LIRC tdb WebRTC -meson .. -Ddatabase="gdbm" --cross-file=${MESON_TARGET_TOOLCHAIN} -ninja +meson .. -Ddatabase="gdbm" --cross-file=${MESON_TARGET_TOOLCHAIN} -Dtests=false +ninja -j${nproc} ninja install """ # These are the platforms we will build for by default, unless further # platforms are passed in on the command line platforms = supported_platforms(; exclude=!Sys.islinux) -# Remove "experimental" architecture armv6l -filter!(p -> arch(p) != "armv6l", platforms) +# Many dependencies are missing for armv6l +filter!(p->arch(p)!="armv6l", platforms) # The products that we will ensure are always built products = [ @@ -145,7 +141,6 @@ products = [ dependencies = [ Dependency(PackageSpec(name="alsa_jll", uuid="45378030-f8ea-5b20-a7c7-1a9d95efb90e")) Dependency(PackageSpec(name="BlueZ_jll", uuid="471b5b61-da80-5748-8755-67d5084d21f2")) - Dependency(PackageSpec(name="Check_jll", uuid="491db154-c145-5abe-9c32-446728d60cce")) Dependency(PackageSpec(name="Dbus_jll", uuid="ee1fde0b-3d02-5ea6-8484-8dfef6360eab")) Dependency(PackageSpec(name="eudev_jll", uuid="35ca27e7-8b34-5b7f-bca9-bdc33f59eb06")) Dependency(PackageSpec(name="FFTW_jll", uuid="f5851436-0d7a-5f13-b9de-f02708fd171a")) @@ -157,7 +152,7 @@ dependencies = [ Dependency(PackageSpec(name="libcap_jll", uuid="eef66a8b-8d7a-5724-a8d2-7c31ae1e29ed")) Dependency(PackageSpec(name="Libiconv_jll", uuid="94ce4f54-9a6c-5748-9c1c-f9c7231a4531")) Dependency(PackageSpec(name="Libtool_jll", uuid="a76c16ae-fb8f-5ff0-8826-da3b7a640f0b")) - Dependency(PackageSpec(name="OpenSSL_jll", uuid="458c3c95-2e84-50aa-8efc-19380b2a3a95"); compat="1.1.10") + Dependency(PackageSpec(name="OpenSSL_jll", uuid="458c3c95-2e84-50aa-8efc-19380b2a3a95"); compat="3.0.8") Dependency(PackageSpec(name="SBC_jll", uuid="da37f231-8920-5702-a09a-bdd970cb6ddc")) Dependency(PackageSpec(name="SoXResampler_jll", uuid="fbe68eb6-6641-54c6-99e3-f7c7c4d73a57")) Dependency(PackageSpec(name="SpeexDSP_jll", uuid="f2f9631b-9a4e-5b48-9975-88f638ec36a7")) @@ -165,4 +160,5 @@ dependencies = [ ] # Build the tarballs, and possibly a `build.jl` as well. -build_tarballs(ARGS, name, version, sources, script, platforms, products, dependencies) +build_tarballs(ARGS, name, version, sources, script, platforms, products, dependencies; + julia_compat="1.6")