Jean-Baptiste Kempf pushed to branch 3.0.x at VideoLAN / VLC
Commits: 67f92551 by Marvin Scholz at 2021-07-06T14:21:28+00:00 contrib: breakpad: correctly install dump_syms If no bin folder existed, it would install the dump_syms binary to a binary called bin, causing all other contribs built after to fail with a rather confusing error as they are of course unable to install into an executable named bin instead of a folder. (cherry picked from commit ff81edf3883f742c91c746f36ef29c9828e4a267) Signed-off-by: Jean-Baptiste Kempf <[email protected]> - - - - - 14433c2e by Martin Finkel at 2021-07-06T14:21:28+00:00 contribs: add vncclient GPL check (cherry picked from commit 40664df3e951a17fc1f8da425d4d89c7b86a2af4) Signed-off-by: Jean-Baptiste Kempf <[email protected]> - - - - - 22999703 by Hugo Beauzée-Luyssen at 2021-07-06T14:21:28+00:00 contribs: Bump libfluidsynth to 2.1.8 In order to include support the fix CVE-2021-28421 (cherry picked from commit 39f444c32d262d6e10928c69ab6070f6c1a49eef) Signed-off-by: Jean-Baptiste Kempf <[email protected]> - - - - - 465a67de by Jean-Baptiste Kempf at 2021-07-06T14:21:28+00:00 Contribs: update libdvbpsi to 1.3.3 (cherry picked from commit 91767679ef6ae2abd9617d427963a0b5ec062ee7) Signed-off-by: Jean-Baptiste Kempf <[email protected]> - - - - - d2f20a90 by Jean-Baptiste Kempf at 2021-07-06T14:21:28+00:00 Contribs: update libarchive to 3.5.1 (cherry picked from commit 4928e31b37bed33f7aa891b229c0f7d476fc3aba) Signed-off-by: Jean-Baptiste Kempf <[email protected]> - - - - - 13 changed files: - contrib/src/breakpad/rules.mak - contrib/src/dvbpsi/SHA512SUMS - contrib/src/dvbpsi/rules.mak - contrib/src/fluid/SHA512SUMS - − contrib/src/fluid/fluid-no-bin.patch - contrib/src/fluid/rules.mak - − contrib/src/libarchive/0001-Fix-retrieving-incorrect-member-from-struct-statfs.patch - − contrib/src/libarchive/0005-don-t-force-windows-versions-if-they-are-set-in-the-.patch - contrib/src/libarchive/SHA512SUMS - − contrib/src/libarchive/fix-types.patch - contrib/src/libarchive/rules.mak - contrib/src/libarchive/winrt.patch - contrib/src/vncclient/rules.mak Changes: ===================================== contrib/src/breakpad/rules.mak ===================================== @@ -29,7 +29,8 @@ ifdef HAVE_MACOSX # Tools cd $</src/tools/mac/dump_syms && \ xcodebuild $(XCODE_FLAGS) CLANG_CXX_LIBRARY=libc++ && \ - cp -R build/Release/dump_syms "$(PREFIX)/bin" + install -d "$(PREFIX)/bin" && \ + install build/Release/dump_syms "$(PREFIX)/bin" else $(RECONF) cd $< && $(HOSTVARS) ./configure $(HOSTCONF) --disable-processor ===================================== contrib/src/dvbpsi/SHA512SUMS ===================================== @@ -1 +1 @@ -cb59c2e66a214cad7bb96aa1f80a178399fcd80da9fc05b22c72763f2cd818bfab3724d36eee4c6467fb8bc8bae18b1d8afec64c02e8e47cd7a6e887f0230309 libdvbpsi-1.3.2.tar.bz2 +70f9e783a947e026ea50afe98ad2b3bfce075bd8d76932f73a6253b077a3a180aa632e9a1fff20308e2f0f3f881d727b4e4aad9b8da2b384edf9a3a0f9eacc69 libdvbpsi-1.3.3.tar.bz2 ===================================== contrib/src/dvbpsi/rules.mak ===================================== @@ -1,6 +1,6 @@ # dvbpsi -DVBPSI_VERSION := 1.3.2 +DVBPSI_VERSION := 1.3.3 DVBPSI_URL := $(VIDEOLAN)/libdvbpsi/$(DVBPSI_VERSION)/libdvbpsi-$(DVBPSI_VERSION).tar.bz2 PKGS += dvbpsi ===================================== contrib/src/fluid/SHA512SUMS ===================================== @@ -1 +1 @@ -0ead8bf86c0edf6d98044eb16b52b85fac8bc3bdeb9c1478d0bceb4f5b38ca28218fcf2cd18cdd5608190dc70b7c39bde681765d01787bc84bc97c6ab3bbf946 fluidsynth-1.1.6.tar.bz2 +34f87ea1577b1e89146a1589c67771262961bb18d0c8b21aaa9a1315e18dffc984f18f21cc8a96cc52dca9e94fcad1bdec2b62678c5f2f3434a4faba713854a6 fluidsynth-2.1.8.tar.gz ===================================== contrib/src/fluid/fluid-no-bin.patch deleted ===================================== @@ -1,11 +0,0 @@ ---- fluidsynth/src/Makefile.am 2007-11-11 21:06:28.000000000 +0100 -+++ fluidsynth.old/src/Makefile.am 2009-07-08 17:48:53.000000000 +0200 -@@ -39,7 +39,7 @@ - config_win32.h fluid_jack.c - - lib_LTLIBRARIES = libfluidsynth.la --bin_PROGRAMS = fluidsynth -+bin_PROGRAMS = - - libfluidsynth_la_SOURCES = \ - $(fluid_alsa) \ ===================================== contrib/src/fluid/rules.mak ===================================== @@ -1,7 +1,7 @@ # fluid -FLUID_VERSION := 1.1.6 -FLUID_URL := $(SF)/fluidsynth/fluidsynth-$(FLUID_VERSION)/fluidsynth-$(FLUID_VERSION).tar.bz2 +FLUID_VERSION := 2.1.8 +FLUID_URL := $(GITHUB)/FluidSynth/fluidsynth/archive/refs/tags/v$(FLUID_VERSION).tar.gz ifeq ($(call need_pkg,"glib-2.0 gthread-2.0"),) PKGS += fluid @@ -12,41 +12,36 @@ endif DEPS_fluid = glib $(DEPS_glib) -$(TARBALLS)/fluidsynth-$(FLUID_VERSION).tar.bz2: +$(TARBALLS)/fluidsynth-$(FLUID_VERSION).tar.gz: $(call download_pkg,$(FLUID_URL),fluid) -.sum-fluid: fluidsynth-$(FLUID_VERSION).tar.bz2 +.sum-fluid: fluidsynth-$(FLUID_VERSION).tar.gz -fluidsynth: fluidsynth-$(FLUID_VERSION).tar.bz2 .sum-fluid +fluidsynth: fluidsynth-$(FLUID_VERSION).tar.gz .sum-fluid $(UNPACK) - $(APPLY) $(SRC)/fluid/fluid-no-bin.patch $(APPLY) $(SRC)/fluid/fluid-pkg-static.patch ifdef HAVE_WIN32 $(APPLY) $(SRC)/fluid/fluid-static-win32.patch endif - # Remove symbolic links to /usr/share/aclocal - cd $(UNPACK_DIR)/m4/ && rm -f libtool.m4 lt*m4 $(MOVE) -FLUIDCONF := $(HOSTCONF) \ - --disable-alsa-support \ - --disable-aufile-support \ - --disable-coreaudio \ - --disable-coremidi \ - --disable-dart \ - --disable-dbus-support \ - --disable-jack-support \ - --disable-ladcca \ - --disable-lash \ - --disable-libsndfile-support \ - --disable-midishare \ - --disable-oss-support \ - --disable-portaudio-support \ - --disable-pulse-support \ - --without-readline - -.fluid: fluidsynth - $(RECONF) - cd $< && $(HOSTVARS) CFLAGS="$(CFLAGS) -DFLUIDSYNTH_NOT_A_DLL" ./configure $(FLUIDCONF) - cd $< && $(MAKE) install +FLUIDCONF := \ + -Denable-alsa=0 \ + -Denable-aufile=0 \ + -Denable-coreaudio=0 \ + -Denable-coremidi=0 \ + -Denable-dart=0 \ + -Denable-dbus=0 \ + -Denable-jack=0 \ + -Denable-lash=0 \ + -Denable-libsndfile=0 \ + -Denable-midishare=0 \ + -Denable-oss=0 \ + -Denable-portaudio=0 \ + -Denable-pulseaudio=0 \ + -Denable-readline=0 + +.fluid: fluidsynth toolchain.cmake + cd $< && $(HOSTVARS) CFLAGS="$(CFLAGS) -DFLUIDSYNTH_NOT_A_DLL" $(CMAKE) $(FLUIDCONF) + cd $< && $(CMAKEBUILD) . --target install touch $@ ===================================== contrib/src/libarchive/0001-Fix-retrieving-incorrect-member-from-struct-statfs.patch deleted ===================================== @@ -1,26 +0,0 @@ -From 9b9e4ff23fa528d831f22d62d072db990b862a62 Mon Sep 17 00:00:00 2001 -From: Martin Matuska <[email protected]> -Date: Thu, 30 Apr 2020 03:46:05 +0200 -Subject: [PATCH] Fix retrieving incorrect member from struct statfs - -Fixes #1355 ---- - libarchive/archive_read_disk_posix.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libarchive/archive_read_disk_posix.c b/libarchive/archive_read_disk_posix.c -index 52fec7bb..95a8087a 100644 ---- a/libarchive/archive_read_disk_posix.c -+++ b/libarchive/archive_read_disk_posix.c -@@ -1840,7 +1840,7 @@ setup_current_filesystem(struct archive_read_disk *a) - #if defined(HAVE_STATVFS) - if (svfs.f_flag & ST_NOATIME) - #else -- if (sfs.f_flag & ST_NOATIME) -+ if (sfs.f_flags & ST_NOATIME) - #endif - t->current_filesystem->noatime = 1; - else --- -2.26.0.windows.1 - ===================================== contrib/src/libarchive/0005-don-t-force-windows-versions-if-they-are-set-in-the-.patch deleted ===================================== @@ -1,44 +0,0 @@ -From a4fa6bef8bdb141d629d79d8d1f3e67448bd67e1 Mon Sep 17 00:00:00 2001 -From: Steve Lhomme <[email protected]> -Date: Thu, 2 Apr 2020 15:33:40 +0200 -Subject: [PATCH 5/5] don't force windows versions if they are set in the - environment - ---- - configure.ac | 20 +++++++++++++++++--- - 1 file changed, 17 insertions(+), 3 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 7312c4d5..05ca4955 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -244,9 +244,23 @@ AM_CONDITIONAL([STATIC_BSDCPIO], [ test "$static_bsdcpio" = yes ]) - # Set up defines needed before including any headers - case $host in - *mingw* | *cygwin* | *msys* ) -- AC_DEFINE([_WIN32_WINNT], 0x0502, [Define to '0x0502' for Windows Server 2003 APIs.]) -- AC_DEFINE([WINVER], 0x0502, [Define to '0x0502' for Windows Server 2003 APIs.]) -- AC_DEFINE([NTDDI_VERSION], 0x05020000, [Define to '0x05020000' for Windows Server 2003 APIs.]) -+ AC_PREPROC_IFELSE([AC_LANG_PROGRAM( -+ [[#ifdef _WIN32_WINNT -+ # error _WIN32_WINNT already defined -+ #endif -+ ]],[[;]]) -+ ],[ -+ AC_DEFINE([_WIN32_WINNT], 0x0502, [Define to '0x0502' for Windows Server 2003 APIs.]) -+ AC_DEFINE([NTDDI_VERSION], 0x05020000, [Define to '0x05020000' for Windows Server 2003 APIs.]) -+ ]) -+ AC_PREPROC_IFELSE([AC_LANG_PROGRAM( -+ [[#ifdef WINVER -+ # error WINVER already defined -+ #endif -+ ]],[[;]]) -+ ],[ -+ AC_DEFINE([WINVER], 0x0502, [Define to '0x0502' for Windows Server 2003 APIs.]) -+ ]) - ;; - esac - --- -2.26.0.windows.1 - ===================================== contrib/src/libarchive/SHA512SUMS ===================================== @@ -1 +1 @@ -a8922e54f2e985889d205ee8a0594c1d30dad950438b602a5be6bb1b274a735ad20a48ed484efd458013a0810d26ee4ae76e3a6c820823243d24ea0593ed7021 libarchive-3.4.2.tar.gz +08ddd74bef4cef0981739da202879f36cf7ca33a8f6d438724588efe3ab8477f2f1d0cccf7b8ed0bedfc0c8d0cab16ee3ae5c0c6e83b6811bc650d7d7471a996 libarchive-3.5.1.tar.gz ===================================== contrib/src/libarchive/fix-types.patch deleted ===================================== @@ -1,43 +0,0 @@ -From 93a8b303904e40261ac58fbd95eb338d6b9cb1df Mon Sep 17 00:00:00 2001 -From: Steve Lhomme <[email protected]> -Date: Fri, 27 Mar 2020 16:26:07 +0100 -Subject: [PATCH 2/4] archive_entry: use the proper define for mode_t - ---- - libarchive/archive_entry.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/libarchive/archive_entry.c b/libarchive/archive_entry.c -index 72c644e6..7afec1b1 100644 ---- a/libarchive/archive_entry.c -+++ b/libarchive/archive_entry.c -@@ -353,7 +353,7 @@ archive_entry_devminor(struct archive_entry *entry) - return minor(entry->ae_stat.aest_dev); - } - --mode_t -+__LA_MODE_T - archive_entry_filetype(struct archive_entry *entry) - { - return (AE_IFMT & entry->acl.mode); -@@ -525,7 +525,7 @@ archive_entry_ino64(struct archive_entry *entry) - return (entry->ae_stat.aest_ino); - } - --mode_t -+__LA_MODE_T - archive_entry_mode(struct archive_entry *entry) - { - return (entry->acl.mode); -@@ -598,7 +598,7 @@ _archive_entry_pathname_l(struct archive_entry *entry, - return (archive_mstring_get_mbs_l(&entry->ae_pathname, p, len, sc)); - } - --mode_t -+__LA_MODE_T - archive_entry_perm(struct archive_entry *entry) - { - return (~AE_IFMT & entry->acl.mode); --- -2.26.0.windows.1 - ===================================== contrib/src/libarchive/rules.mak ===================================== @@ -1,5 +1,5 @@ # LIBARCHIVE -LIBARCHIVE_VERSION := 3.4.2 +LIBARCHIVE_VERSION := 3.5.1 LIBARCHIVE_URL := http://www.libarchive.org/downloads/libarchive-$(LIBARCHIVE_VERSION).tar.gz PKGS += libarchive @@ -16,9 +16,6 @@ $(TARBALLS)/libarchive-$(LIBARCHIVE_VERSION).tar.gz: libarchive: libarchive-$(LIBARCHIVE_VERSION).tar.gz .sum-libarchive $(UNPACK) - $(APPLY) $(SRC)/libarchive/0001-Fix-retrieving-incorrect-member-from-struct-statfs.patch - $(APPLY) $(SRC)/libarchive/fix-types.patch - $(APPLY) $(SRC)/libarchive/0005-don-t-force-windows-versions-if-they-are-set-in-the-.patch ifdef HAVE_ANDROID $(APPLY) $(SRC)/libarchive/android.patch endif ===================================== contrib/src/libarchive/winrt.patch ===================================== @@ -255,15 +255,6 @@ index b8bf1288..2197ed41 100644 /* Avoid infinity wait. * Note: If there is no data in the pipe, ReadFile() * called in read() never returns and so we won't -@@ -437,7 +439,7 @@ __archive_read_program(struct archive_read_filter *self, const char *cmd) - cmd); - return (ARCHIVE_FATAL); - } --#if defined(_WIN32) && !defined(__CYGWIN__) -+#if defined(_WIN32) && !defined(__CYGWIN__) && WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) - state->child = OpenProcess(PROCESS_QUERY_INFORMATION, FALSE, child); - if (state->child == NULL) { - child_stop(self, state); @@ -516,3 +518,5 @@ program_filter_close(struct archive_read_filter *self) return (e); @@ -514,30 +505,27 @@ index 47b7cb8e..9743f310 100644 #define WEXITSTATUS(sts) (sts & 0x0FF) diff --git a/libarchive/filter_fork_windows.c b/libarchive/filter_fork_windows.c index ad271fe6..0414d6f4 100644 ---- a/libarchive/filter_fork_windows.c -+++ b/libarchive/filter_fork_windows.c +--- a/libarchive/filter_fork_windows.c.orig 2020-12-26 02:29:38.000000000 +0100 ++++ b/libarchive/filter_fork_windows.c 2021-04-21 17:17:42.651099766 +0200 @@ -31,6 +31,13 @@ #include "filter_fork.h" +#if !WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP) -+pid_t -+__archive_create_child(const char *cmd, int *child_stdin, int *child_stdout) ++int ++__archive_create_child(const char *cmd, int *child_stdin, int *child_stdout, HANDLE *out_child) +{ -+ return (-1); ++ return ARCHIVE_FAILED; +} +#else /* WINAPI_PARTITION_DESKTOP */ - pid_t - __archive_create_child(const char *cmd, int *child_stdin, int *child_stdout) - { -@@ -178,6 +185,7 @@ fail: + int + __archive_create_child(const char *cmd, int *child_stdin, int *child_stdout, + HANDLE *out_child) +@@ -187,6 +194,7 @@ __archive_cmdline_free(acmd); - return (-1); + return ARCHIVE_FAILED; } +#endif /* WINAPI_PARTITION_DESKTOP */ void __archive_check_child(int in, int out) --- -2.26.0.windows.1 - ===================================== contrib/src/vncclient/rules.mak ===================================== @@ -3,12 +3,14 @@ VNCCLIENT_VERSION := 0.9.10 VNCCLIENT_URL := https://github.com/LibVNC/libvncserver/archive/LibVNCServer-$(VNCCLIENT_VERSION).tar.gz +ifdef GPL ifdef BUILD_NETWORK PKGS += vncclient endif ifeq ($(call need_pkg,"libvncclient"),) PKGS_FOUND += vncclient endif +endif $(TARBALLS)/LibVNCServer-$(VNCCLIENT_VERSION).tar.gz: $(call download_pkg,$(VNCCLIENT_URL),vncclient) @@ -31,6 +33,7 @@ vncclient: LibVNCServer-$(VNCCLIENT_VERSION).tar.gz .sum-vncclient DEPS_vncclient = gcrypt $(DEPS_gcrypt) jpeg $(DEPS_jpeg) png $(DEPS_png) gnutls $(DEPS_gnutls) .vncclient: vncclient + $(REQUIRE_GPL) $(RECONF) cd $< && $(HOSTVARS) ./configure $(HOSTCONF) --without-libva cd $< && $(MAKE) -C libvncclient install View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/8937674b29486d6b470c31fc1ebf5f4ed9f715ec...d2f20a9010f3fea814d78ef84efb526894d19e51 -- View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/8937674b29486d6b470c31fc1ebf5f4ed9f715ec...d2f20a9010f3fea814d78ef84efb526894d19e51 You're receiving this email because of your account on code.videolan.org.
_______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
