[vlc-commits] [Git][videolan/vlc][master] 5 commits: Contribs: update Twolame to 0.4.0
Jean-Baptiste Kempf (@jbk)
gitlab at videolan.org
Wed Feb 16 06:33:31 UTC 2022
Jean-Baptiste Kempf pushed to branch master at VideoLAN / VLC
Commits:
fb1dd770 by Jean-Baptiste Kempf at 2022-02-15T22:36:31+00:00
Contribs: update Twolame to 0.4.0
- - - - -
d6717612 by Jean-Baptiste Kempf at 2022-02-15T22:36:31+00:00
Contribs: update mpg123 to 1.29.3
- - - - -
9a289291 by Jean-Baptiste Kempf at 2022-02-15T22:36:31+00:00
Contribs: update SRT to 1.4.4
- - - - -
50baf567 by Jean-Baptiste Kempf at 2022-02-15T22:36:31+00:00
Contribs: update NFS to 5.0.1
- - - - -
e308b8c8 by Jean-Baptiste Kempf at 2022-02-15T22:36:31+00:00
Contribs: update libarchive to 3.6.0
Fixes CVE-2021-31566, CVE-2021-36976
- - - - -
15 changed files:
- contrib/src/libarchive/SHA512SUMS
- contrib/src/libarchive/android.patch
- − contrib/src/libarchive/configure.ac-add-AC_PROG_CPP.patch
- contrib/src/libarchive/rules.mak
- contrib/src/mpg123/SHA512SUMS
- − contrib/src/mpg123/fix-arm_fpu.patch
- contrib/src/mpg123/rules.mak
- contrib/src/nfs/SHA512SUMS
- − contrib/src/nfs/mingw-snprintf.patch
- contrib/src/nfs/rules.mak
- contrib/src/srt/SHA512SUMS
- − contrib/src/srt/fix-gcc11-build.patch
- contrib/src/srt/rules.mak
- contrib/src/twolame/SHA512SUMS
- contrib/src/twolame/rules.mak
Changes:
=====================================
contrib/src/libarchive/SHA512SUMS
=====================================
@@ -1 +1 @@
-08ddd74bef4cef0981739da202879f36cf7ca33a8f6d438724588efe3ab8477f2f1d0cccf7b8ed0bedfc0c8d0cab16ee3ae5c0c6e83b6811bc650d7d7471a996 libarchive-3.5.1.tar.gz
+700579c5dd15b61333cc4dbf01ebfbd26d6e8c20d5cbe6525683634418fec5c87a5a1e28a81cc59ad7c94218682e406aa3b55d81036bd9fa31d83d989c6d764c libarchive-3.6.0.tar.gz
=====================================
contrib/src/libarchive/android.patch
=====================================
@@ -1,18 +1,6 @@
-diff -ruN libarchive/Makefile.am libarchive.new/Makefile.am
---- libarchive/Makefile.am 2016-10-24 04:20:30.000000000 +0200
-+++ libarchive.new/Makefile.am 2017-01-19 12:58:42.433742303 +0100
-@@ -246,6 +246,7 @@
-
- # -no-undefined marks that libarchive doesn't rely on symbols
- # defined in the application. This is mandatory for cygwin.
-+libarchive_la_CPPFLAGS= -I$(top_srcdir)/contrib/android/include
- libarchive_la_LDFLAGS= -no-undefined -version-info $(ARCHIVE_LIBTOOL_VERSION)
- libarchive_la_LIBADD= $(LTLIBICONV)
-
-diff -ruN libarchive/Makefile.am libarchive.new/Makefile.am
---- libarchive/Makefile.am 2017-01-19 14:56:31.721427332 +0100
-+++ libarchive.new/Makefile.am 2017-01-19 14:52:46.857437351 +0100
-@@ -88,7 +88,7 @@
+--- libarchive/Makefile.am.orig 2022-02-09 13:24:12.000000000 +0100
++++ libarchive/Makefile.am 2022-02-14 19:22:31.487152622 +0100
+@@ -89,7 +89,7 @@
#
#
@@ -21,3 +9,11 @@ diff -ruN libarchive/Makefile.am libarchive.new/Makefile.am
libarchive_la_SOURCES= \
libarchive/archive_acl.c \
+@@ -284,6 +284,7 @@
+
+ # -no-undefined marks that libarchive doesn't rely on symbols
+ # defined in the application. This is mandatory for cygwin.
++libarchive_la_CPPFLAGS= -I$(top_srcdir)/contrib/android/include
+ libarchive_la_LDFLAGS= -no-undefined -version-info $(ARCHIVE_LIBTOOL_VERSION) $(GC_SECTIONS)
+ libarchive_la_LIBADD= $(LTLIBICONV)
+
=====================================
contrib/src/libarchive/configure.ac-add-AC_PROG_CPP.patch deleted
=====================================
@@ -1,27 +0,0 @@
-From b4c5bf51436d876631e12ed8533e86405f8581d7 Mon Sep 17 00:00:00 2001
-From: Alexandre Janniaux <ajanni at videolabs.io>
-Date: Mon, 11 Jan 2021 12:31:53 +0100
-Subject: [PATCH] configure.ac: add AC_PROG_CPP
-
-Otherwise, the preprocessor is not detected and it leads to failure with
-empty $CPP variable being used on la_TYPE_UID_T, leading to a cascade of
-detection errors and redefinition of some types.
----
- configure.ac | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/configure.ac b/configure.ac
-index 3b4602f5..d51fa19c 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -107,6 +107,7 @@ AC_SUBST(PLATFORMCPPFLAGS)
- AC_PROG_CC
- AC_PROG_CC_C99
- AM_PROG_CC_C_O
-+AC_PROG_CPP
- AC_USE_SYSTEM_EXTENSIONS
- AC_LIBTOOL_WIN32_DLL
- AC_PROG_LIBTOOL
---
-2.30.0
-
=====================================
contrib/src/libarchive/rules.mak
=====================================
@@ -1,5 +1,5 @@
# LIBARCHIVE
-LIBARCHIVE_VERSION := 3.5.1
+LIBARCHIVE_VERSION := 3.6.0
LIBARCHIVE_URL := http://www.libarchive.org/downloads/libarchive-$(LIBARCHIVE_VERSION).tar.gz
PKGS += libarchive
@@ -31,7 +31,6 @@ endif
ifdef HAVE_WINSTORE
$(APPLY) $(SRC)/libarchive/winrt.patch
endif
- $(APPLY) $(SRC)/libarchive/configure.ac-add-AC_PROG_CPP.patch
$(call pkg_static,"build/pkgconfig/libarchive.pc.in")
$(MOVE)
=====================================
contrib/src/mpg123/SHA512SUMS
=====================================
@@ -1 +1 @@
-4e333ee4f3bbebcfff280cf286265e969a8da93b9043d03c0189e22cd40918b07bf12181bd06141d4479c78bc0d0ed472e0d3bb61b2fdb96fe9f7cd48f9a6b77 mpg123-1.28.0.tar.bz2
+0d8db63f9bae1507887bc5241a56abccfeb767b7ba8362eb0fce9de2f63369e57fdd6f25a953f8ef5f9ead4f400237db51914816e278566fdf8e6f205ebca5d6 mpg123-1.29.3.tar.bz2
=====================================
contrib/src/mpg123/fix-arm_fpu.patch deleted
=====================================
@@ -1,23 +0,0 @@
-From e9f8967461ac2498f8af9e3127188c0095f9306c Mon Sep 17 00:00:00 2001
-From: thor <thor at 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.28.0
+MPG123_VERSION := 1.29.3
MPG123_URL := $(SF)/mpg123/mpg123/$(MPG123_VERSION)/mpg123-$(MPG123_VERSION).tar.bz2
PKGS += mpg123
@@ -38,7 +38,6 @@ $(TARBALLS)/mpg123-$(MPG123_VERSION).tar.bz2:
mpg123: mpg123-$(MPG123_VERSION).tar.bz2 .sum-mpg123
$(UNPACK)
$(APPLY) $(SRC)/mpg123/no-programs.patch
- $(APPLY) $(SRC)/mpg123/fix-arm_fpu.patch
$(call pkg_static,"libmpg123.pc.in")
$(MOVE)
=====================================
contrib/src/nfs/SHA512SUMS
=====================================
@@ -1 +1 @@
-3d93d83d1909f24de304c0d47fa6240da7ecf43ce2488a242a58ddabe51d774caf813f5a90ae720a8edd251a765b30e88c0e5b6a13ecb254dfecdc98e30737fa libnfs-4.0.0.tar.gz
+71f2dcfa8945c1cb6402f5fca10b1f7a4720f7589807d6130eb55361f05ef4684f9cc9a177ece4e13d3847ac6606924115fac7b27749cecc2f5aca6fa9c63ebf libnfs-5.0.1.tar.gz
=====================================
contrib/src/nfs/mingw-snprintf.patch deleted
=====================================
@@ -1,11 +0,0 @@
---- nfs/include/win32/win32_compat.h.orig 2021-03-15 10:40:08.534061716 +0200
-+++ nfs/include/win32/win32_compat.h 2021-03-15 10:40:54.088974157 +0200
-@@ -133,7 +133,7 @@
-
- /* Wrapper macros to call misc. functions win32 is missing */
- #define poll(x, y, z) win32_poll(x, y, z)
--#define snprintf sprintf_s
-+//#define snprintf sprintf_s
- #define inet_pton(x,y,z) win32_inet_pton(x,y,z)
- #define open(x, y, z) _open(x, y, z)
- #ifndef lseek
=====================================
contrib/src/nfs/rules.mak
=====================================
@@ -1,5 +1,5 @@
# NFS
-NFS_VERSION := 4.0.0
+NFS_VERSION := 5.0.1
NFS_URL := https://github.com/sahlberg/libnfs/archive/libnfs-$(NFS_VERSION).tar.gz
PKGS += nfs
@@ -15,7 +15,6 @@ $(TARBALLS)/libnfs-$(NFS_VERSION).tar.gz:
nfs: libnfs-$(NFS_VERSION).tar.gz .sum-nfs
$(UNPACK)
mv libnfs-libnfs-$(NFS_VERSION) libnfs-$(NFS_VERSION)
- $(APPLY) $(SRC)/nfs/mingw-snprintf.patch
$(UPDATE_AUTOCONFIG)
$(MOVE)
=====================================
contrib/src/srt/SHA512SUMS
=====================================
@@ -1 +1 @@
-4c978e3898737e566f47222a0095df1b49591d79927850cc94c838b7eaccf401faf1c5d038fa45b6fd30c85f980e7c212a79c07ed6f9008430e8a5a594a31ffe srt-1.4.2.tar.gz
+0d51e0ef73f4aa7eb284288cdbbd75b1c161969c2c2fed3a6d4e13a931341ca41dfcf2d6c1b9728f72b43454a9fde3764da67a27af9f0c99a6818682e4f4d4ba srt-1.4.4.tar.gz
=====================================
contrib/src/srt/fix-gcc11-build.patch deleted
=====================================
@@ -1,22 +0,0 @@
-From f1b35cbf5b9b42b031e9b119e4c802b5f744468c Mon Sep 17 00:00:00 2001
-From: Christophe Giboudeaux <krop at users.noreply.github.com>
-Date: Wed, 10 Feb 2021 12:42:45 +0000
-Subject: [PATCH] [core] Fix build with GCC 11. (#1806)
-
-The 'limits' header must be included explicitly.
----
- srtcore/sync.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/srtcore/sync.h b/srtcore/sync.h
-index 59c125a75..9f01ca91e 100644
---- a/srtcore/sync.h
-+++ b/srtcore/sync.h
-@@ -15,6 +15,7 @@
- //#define ENABLE_CXX17
-
- #include <cstdlib>
-+#include <limits>
- #ifdef ENABLE_STDCXX_SYNC
- #include <chrono>
- #include <thread>
=====================================
contrib/src/srt/rules.mak
=====================================
@@ -1,6 +1,6 @@
# srt
-SRT_VERSION := 1.4.2
+SRT_VERSION := 1.4.4
SRT_URL := $(GITHUB)/Haivision/srt/archive/v$(SRT_VERSION).tar.gz
ifdef BUILD_NETWORK
@@ -27,7 +27,6 @@ $(TARBALLS)/srt-$(SRT_VERSION).tar.gz:
srt: srt-$(SRT_VERSION).tar.gz .sum-srt
$(UNPACK)
$(APPLY) $(SRC)/srt/0001-core-ifdef-MSG_TRUNC-nixes-fix.patch
- $(APPLY) $(SRC)/srt/fix-gcc11-build.patch
$(call pkg_static,"scripts/srt.pc.in")
mv srt-$(SRT_VERSION) $@ && touch $@
=====================================
contrib/src/twolame/SHA512SUMS
=====================================
@@ -1 +1 @@
-241ae5faebf05cb919959bb0545cb89e9b71cfb07f92a7118d864499ea4f0065ddaa646ab1482ffbcbca427d52c2436764074bd67fd19a1eb9979987f23163f7 twolame-0.3.13.tar.gz
+cc594bc8d2322922280f915a3c0aa52540cca0350d6498bc96f3f60fd6e53f951e775ea015a44bdb29ec883b46b31a0e5483f6a5c188b02e30008289273c7d03 twolame-0.4.0.tar.gz
=====================================
contrib/src/twolame/rules.mak
=====================================
@@ -1,6 +1,6 @@
# twolame
-TWOLAME_VERSION := 0.3.13
+TWOLAME_VERSION := 0.4.0
TWOLAME_URL := $(SF)/twolame/twolame-$(TWOLAME_VERSION).tar.gz
ifdef BUILD_ENCODERS
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/7b8d3fc00182c3e8338c990b50de38f841434ef4...e308b8c851490c672883813c7c0004dee95fc2fc
--
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/7b8d3fc00182c3e8338c990b50de38f841434ef4...e308b8c851490c672883813c7c0004dee95fc2fc
You're receiving this email because of your account on code.videolan.org.
VideoLAN code repository instance
More information about the vlc-commits
mailing list