Hugo Beauzée-Luyssen pushed to branch 3.0.x at VideoLAN / VLC
Commits: d0dfeefe by Steve Lhomme at 2022-02-11T09:38:35+01:00 contrib: srt: fix dependency handling (cherry picked from commit e94213427ef84e278b236e803b100a94df2674fe) (rebased) rebased: * 3.0 has slightly different patches Signed-off-by: Steve Lhomme <[email protected]> - - - - - a02853f8 by Steve Lhomme at 2022-02-11T09:38:35+01:00 contrib: zvbi: make sure we use pthreads-win32 on windows (cherry picked from commit 707b9000194c85c6a23b55357ca72afb197b111b) Signed-off-by: Steve Lhomme <[email protected]> - - - - - 6b476972 by Steve Lhomme at 2022-02-11T09:41:24+01:00 contrib: vpx: make sure we use pthreads-win32 on Windows (cherry picked from commit 2916292eb7c3a3b77d5aea677372a8725b52a18c) (edited) edited: * 3.0 doesn't have the same aarch64 patches Signed-off-by: Steve Lhomme <[email protected]> - - - - - c7afbc4b by Steve Lhomme at 2022-02-11T09:41:24+01:00 contrib: aom: make sur we use pthreads-win32 on Windows (cherry picked from commit b7bbf72878edfd230bd17d799a198c9bed395058) (rebased) rebased: - 3.0 has more android patches Signed-off-by: Steve Lhomme <[email protected]> - - - - - e641bf59 by Steve Lhomme at 2022-02-11T09:41:25+01:00 contrib: pthreads: only use pthreads-w32 on winstore builds For now, we should probably switch to winpthread as well. (cherry picked from commit a77bf1c60b9daf6a10dc3f8afb8dd6da139c3bc4) Signed-off-by: Steve Lhomme <[email protected]> - - - - - 13188e48 by Steve Lhomme at 2022-02-11T09:47:41+01:00 contrib: limit the use of pthreads-w32 to winstore builds for now (cherry picked from commit 6f20847b5ddb4ca30edeffe0c490eaf56a478d01) (edited) edited: * aom has different android patches * srt has extra fix-partial-availability patch * upnp is using LIBUPNP_ECFLAGS on 3.0 * vpx is using VPX_HOSTVARS on 3.0 * zvbi has the pthreads dependency for all targets, already has ZVBI_CFLAGS and removed macos hack already * srt doesn't have some gcc/pthread patches and had CMakeLists.txt-let-cmake-find-pthread patch Signed-off-by: Steve Lhomme <[email protected]> - - - - - 0885d5e4 by Steve Lhomme at 2022-02-11T09:47:43+01:00 contrib: replace pthreads-w32 with winpthreads (cherry picked from commit 1d156f093dbeca94a20c7355708e2f7bdce586b4) (edited) edited: * pthreadGC2 had extra pacthes in 3.0 and different URL * aom had different android patches and HOSTVARS placed differently * mysofa is building with CMAKEBUILD * DBUILD_SHARED_LIBS doesn't have set in 3.0 * upnp uses LIBUPNP_ECFLAGS on 3.0 * vpc uses VPX_HOSTVARS on 3.0 * zvbi has removed the macos hack already Signed-off-by: Steve Lhomme <[email protected]> - - - - - c61028af by Steve Lhomme at 2022-02-11T09:48:00+01:00 contribs: enable winpthreads on all Windows targets (cherry picked from commit f1bf4b45ce547578db7048331e368188a7f6b8ec) (rebased) rebased: * aom has slightly diffent .mak context * srt has slightly diffent .mak context * zvbi had removed macos hack already Signed-off-by: Steve Lhomme <[email protected]> - - - - - 6320e649 by Steve Lhomme at 2022-02-11T09:48:00+01:00 contrib: pthreads: winpthreads is not GPL (cherry picked from commit be8644102b0045f40c0537df95db015d48fe8994) Signed-off-by: Steve Lhomme <[email protected]> - - - - - 8a76af75 by Martin Storsjö at 2022-02-11T09:48:01+01:00 contrib: pthreads: Backport a winpthreads patch to fix building for armv7/aarch64 (cherry picked from commit 8ceae50d2e3c037dade05953b175ebabf3fdd7c3) (rebased) rebased: * 4.0 didn't some of the patches used in 3.0 Signed-off-by: Steve Lhomme <[email protected]> - - - - - cf31dd35 by Martin Storsjö at 2022-02-11T09:48:01+01:00 contrib: vpx: Remove a leftover patch for pthread-w32 (cherry picked from commit d942c7a0d4f840a93c074c774ea16226517c8865) (edited) edited: * 3.0 doesn't have the same aarch64 patches Signed-off-by: Steve Lhomme <[email protected]> - - - - - 71f5df11 by Hugo Beauzée-Luyssen at 2022-02-11T09:48:01+01:00 contrib: upnp: Force -lpthread into libupnp.pc This is a partial revert (with modifications) of 1d156f093dbeca94a20c7355708e2f7bdce586b4 (cherry picked from commit db1d637fce6731fad870304e8e2d309f9781b268) Signed-off-by: Steve Lhomme <[email protected]> - - - - - e92fbe6e by Steve Lhomme at 2022-02-11T09:48:02+01:00 contrib:aom: don't use the old pthreadGC2 anymore (cherry picked from commit ba189e92f8ea393f6355dee1a0f7c2f6eb573bc6) (edited) edited: * 3.0 has different android patches Signed-off-by: Steve Lhomme <[email protected]> - - - - - f61e85e7 by Steve Lhomme at 2022-02-11T09:48:02+01:00 zvbi: do not link against non existent pthreadGC2 (cherry picked from commit f91f18e43cf61e05e6e2d8709124595de2b339bf) (edited) edited: * master had it for winstore only Signed-off-by: Steve Lhomme <[email protected]> - - - - - cc62c44d by Biswapriyo Nath at 2022-02-11T09:48:02+01:00 contrib: pthreads: update mingw-w64 to v7.0.0 * The deleted patch was added in mingw-w64 v7.0.0 Signed-off-by: Biswapriyo Nath <[email protected]> Signed-off-by: Steve Lhomme <[email protected]> (cherry picked from commit d4948bc28effbe801fbce6c581c1735518c9da0d) - - - - - 54802179 by Sean McGovern at 2022-02-11T09:48:02+01:00 contrib: upnp: hosting moved from SourceForge to GitHub (cherry picked from commit 0d2b80c01c37c928821b5f35bf75f4693335af4c) Signed-off-by: Steve Lhomme <[email protected]> - - - - - 962cadad by Hugo Beauzée-Luyssen at 2022-02-11T09:48:03+01:00 tools: Fix protobuf compiler build with recent compilers This is a manual backport of https://github.com/protocolbuffers/protobuf/commit/01a05a53f40ca2ac5f0af10c6cc0810bee39b792 (cherry picked from commit c580054e4f3a166f93c91f94416f97d89be83c16) Signed-off-by: Steve Lhomme <[email protected]> - - - - - 2c6d2bb0 by Marvin Scholz at 2022-02-11T09:48:03+01:00 extras/tools: meson: create bin folder if needed Fixes the "build" of meson that could randomly fail when no target created the folder already. (cherry picked from commit 1649e121586f4bfd0f9f430d6f07e423a7eedc7d) Signed-off-by: Steve Lhomme <[email protected]> - - - - - def52810 by Steve Lhomme at 2022-02-11T09:48:03+01:00 contrib: zvbi: remove deprecated patch We no longer build with pthreadGC2 since f1bf4b45ce547578db7048331e368188a7f6b8ec (cherry picked from commit 3837f53f97ec6f85f8441a22f3ed7e032929a06e) Signed-off-by: Steve Lhomme <[email protected]> - - - - - 01945fc3 by Steve Lhomme at 2022-02-11T09:48:04+01:00 contrib: zvbi: fix pthread dependency (cherry picked from commit 1ae503e45da0e4b8ea92d36956d750ad9872090e) Signed-off-by: Steve Lhomme <[email protected]> - - - - - df9a8982 by Steve Lhomme at 2022-02-11T09:48:04+01:00 contrib: zvbi: remove unused extra compilation flags (cherry picked from commit e1ebf07d6e2a9c95db006950dfe0782e1cb9e775) Signed-off-by: Steve Lhomme <[email protected]> - - - - - 3ce799b8 by Steve Lhomme at 2022-02-11T09:48:04+01:00 contrib: ffmpeg: disable threading API on builds supporting Win XP CancelIOEx() is not supported. And pthread support is not mandatory. - - - - - b608c5f6 by Steve Lhomme at 2022-02-11T09:48:05+01:00 contrib: ffmpeg: add pthread dependency for win32 As for other contribs that rely on the winpthread/pthread-w32. - - - - - 1b500a19 by Steve Lhomme at 2022-02-11T09:50:22+01:00 contrib: srt: link directly with pthread on Windows That's the winpthread we build and depend on. And apply the pthread patch on all targets like it was before this patchset. - - - - - 30 changed files: - contrib/src/aom/rules.mak - contrib/src/ffmpeg/0001-bring-back-XP-support.patch - contrib/src/ffmpeg/rules.mak - contrib/src/libplacebo/0001-build-use-a-Makefile.patch - contrib/src/libplacebo/rules.mak - contrib/src/mysofa/rules.mak - contrib/src/openjpeg/rules.mak - contrib/src/protobuf/rules.mak - contrib/src/pthreads/SHA512SUMS - − contrib/src/pthreads/arm64.patch - − contrib/src/pthreads/implib.patch - − contrib/src/pthreads/pthread-fix-inline.patch - − contrib/src/pthreads/pthreads-fix-mode_t.patch - − contrib/src/pthreads/pthreads-fix-old-mingw.patch - − contrib/src/pthreads/remove-inline.patch - contrib/src/pthreads/rules.mak - − contrib/src/pthreads/winrt.patch - − contrib/src/pthreads/x86-inline-asm.patch - contrib/src/srt/0002-CMakeLists.txt-let-cmake-find-pthread.patch - contrib/src/srt/rules.mak - − contrib/src/upnp/libupnp-configure.patch - + contrib/src/upnp/libupnp-pthread-w32-checks.patch - + contrib/src/upnp/libupnp-pthread-w32-force.patch - + contrib/src/upnp/libupnp-win32-exports.patch - contrib/src/upnp/libupnp-win32.patch - contrib/src/upnp/rules.mak - contrib/src/vpx/rules.mak - contrib/src/x264/rules.mak - contrib/src/zvbi/rules.mak - contrib/src/zvbi/zvbi-win32.patch The diff was not included because it is too large. View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/5c999faac3e4a4764dd9790379b999c3fdb123d4...1b500a19695aa3e0c4179e89abccbe8e5bfce285 -- View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/5c999faac3e4a4764dd9790379b999c3fdb123d4...1b500a19695aa3e0c4179e89abccbe8e5bfce285 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
