Thomas Guillem pushed to branch 3.0.x at VideoLAN / VLC
Commits: afb0acef by Thomas Guillem at 2021-06-14T08:20:12+00:00 contrib: update mpg123 to 1.28.0 Quoting mpg123.de website: "Fix misguided handling of part2_3_length checks in III_get_scale_factors_1() and III_get_scale_factors_2() which invalidated decoding of a mono source encoded as ms+i-stereo. This was a regression introduced with version 1.25.7." Fixes #25798 (cherry picked from commit 62bf14a8563855aeb77441083e38824cddedaf30) Signed-off-by: Thomas Guillem <tho...@gllm.fr> - - - - - 3 changed files: - contrib/src/mpg123/SHA512SUMS - + contrib/src/mpg123/fix-arm_fpu.patch - contrib/src/mpg123/rules.mak Changes: ===================================== contrib/src/mpg123/SHA512SUMS ===================================== @@ -1 +1 @@ -aa63fcb08b243a1e09f7701b3d84a19d7412a87253d54d49f014fdb9e75bbc81d152a41ed750fccde901453929b2a001585a7645351b41845ad205c17a73dcc9 mpg123-1.26.2.tar.bz2 +4e333ee4f3bbebcfff280cf286265e969a8da93b9043d03c0189e22cd40918b07bf12181bd06141d4479c78bc0d0ed472e0d3bb61b2fdb96fe9f7cd48f9a6b77 mpg123-1.28.0.tar.bz2 ===================================== contrib/src/mpg123/fix-arm_fpu.patch ===================================== @@ -0,0 +1,23 @@ +From e9f8967461ac2498f8af9e3127188c0095f9306c Mon Sep 17 00:00:00 2001 +From: thor <thor@35dc7657-300d-0410-a2e5-dc2837fedb53> +Date: Mon, 7 Jun 2021 19:21:27 +0000 +Subject: [PATCH] build: fix arm_fpu setup again + +git-svn-id: svn://scm.orgis.org/mpg123/trunk@4945 35dc7657-300d-0410-a2e5-dc2837fedb53 +--- + configure.ac | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/configure.ac b/configure.ac +index de90297f..9753588e 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1436,7 +1436,7 @@ case $cpu_type in + ;; + arm_fpu) + ADD_CPPFLAGS="$ADD_CPPFLAGS -DOPT_MULTI -DOPT_GENERIC -DOPT_GENERIC_DITHER -DOPT_NEON -DREAL_IS_FLOAT" +- more_sources="$s_neon$s_dither $s_arm_multi" ++ more_sources="$s_neon $s_dither $s_arm_multi" + ;; + neon64) + ADD_CPPFLAGS="$ADD_CPPFLAGS -DOPT_NEON64 -DREAL_IS_FLOAT" ===================================== contrib/src/mpg123/rules.mak ===================================== @@ -1,5 +1,5 @@ # mpg123 -MPG123_VERSION := 1.26.2 +MPG123_VERSION := 1.28.0 MPG123_URL := $(SF)/mpg123/mpg123/$(MPG123_VERSION)/mpg123-$(MPG123_VERSION).tar.bz2 PKGS += mpg123 @@ -37,9 +37,8 @@ $(TARBALLS)/mpg123-$(MPG123_VERSION).tar.bz2: mpg123: mpg123-$(MPG123_VERSION).tar.bz2 .sum-mpg123 $(UNPACK) - # remove generated file from the source package - cd $(UNPACK_DIR) && rm -rf src/libsyn123/syn123.h $(APPLY) $(SRC)/mpg123/no-programs.patch + $(APPLY) $(SRC)/mpg123/fix-arm_fpu.patch $(call pkg_static,"libmpg123.pc.in") $(MOVE) View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/afb0acef054046673a7636246da53979762cf9f1 -- View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/afb0acef054046673a7636246da53979762cf9f1 You're receiving this email because of your account on code.videolan.org.
_______________________________________________ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits