[vlc-commits] [Git][videolan/vlc][3.0.x] 21 commits: contrib: use $(MAKE) -C to build

Steve Lhomme (@robUx4) gitlab at videolan.org
Sun Aug 3 06:17:12 UTC 2025 


Steve Lhomme pushed to branch 3.0.x at VideoLAN / VLC


Commits:
77e9b206 by Steve Lhomme at 2025-08-03T05:26:14+00:00
contrib: use $(MAKE) -C to build

(cherry picked from commit 3ce55c39551fb6188718330b333a1fd24a8cb1ee)

- - - - -
194f5235 by Steve Lhomme at 2025-08-03T05:26:14+00:00
contrib: zlib: build with CMake

(cherry picked from commit c3af02188c623692d33a703020f65ecf3d18f39e)

- - - - -
114a2091 by Steve Lhomme at 2025-08-03T05:26:14+00:00
contrib: call sed directly on the files to change

(cherry picked from commit 637d00420fa1a3f4b71215ba869cb5d05bb7bead)

- - - - -
bc5a81c2 by Steve Lhomme at 2025-08-03T05:26:14+00:00
contrib: zlib: disable building examples

Hopefully this should fix the odd emscripten random build failure.

(cherry picked from commit cc0c26ab1de415c960788a965a8f0ae47bcbec6c)

- - - - -
e2e42eaa by Steve Lhomme at 2025-08-03T05:26:14+00:00
contrib: zlib: only use the proper libz name for the static library

We don't care about the dynamic library. It should not pollute our build with a
similar name.

(cherry picked from commit 1419660b5e4cc260adcdaf8d51ae50b3b7cf700a)

- - - - -
16d5a848 by Alexandre Janniaux at 2025-08-03T05:26:14+00:00
contrib: zlib: bump to 1.3.1

Rewrite the first patch on top of v1.3.1 and simplify it since we always
need the same name for the static zlib target.

Remove the second patch since there is now a ZLIB_BUILD_EXAMPLES cmake
switch to disable the examples.

(cherry picked from commit 29fbfc0d75e361293ed8c86b837ac4c761f0839a)

- - - - -
655f0a35 by Steve Lhomme at 2025-08-03T05:26:14+00:00
contrib: zlib: disable --version-script on static libraries

According to the documentation it's only useful for shared libraries.
With recent Android NDK this leads to linking issues with gz_intmax
In autotools it's only set with LDSHARED.

https://ftp.gnu.org/old-gnu/Manuals/ld-2.9.1/html_chapter/ld_3.html
(cherry picked from commit e50ca0c0b407195d7d3ecc77fdaccb2ec01eda6d)

- - - - -
afb5a980 by Steve Lhomme at 2025-08-03T05:26:14+00:00
contrib: png: build with CMake

And don't depend on an outdated automake 1.11 version.

(cherry picked from commit 319339db5a538afe1490038e2bf8c8731cf3a710)

- - - - -
8aef6c5b by Steve Lhomme at 2025-08-03T05:26:14+00:00
contrib: png: update to 1.6.38

* Added configurations and scripts for continuous integration.
* Fixed various errors in the handling of tRNS, hIST and eXIf.
* Implemented many stability improvements across all platforms.
* Updated the internal documentation.

(cherry picked from commit 20bdf55cb5a5903b2c3bc032bf646e3f0b903a64)

- - - - -
845eb474 by Martin Storsjö at 2025-08-03T05:26:14+00:00
contrib: png: Don't require runtime checks for NEON on arm on win32

NEON is always available there, just like on iOS.

This fixes building for Windows on ARM after switching to building
libpng with CMake - after that change, building failed due to
"No support for run-time ARM Neon checking; use compile-time options".

(cherry picked from commit a4240eedabe5ef823d929d48449d36c64a71ada8)

- - - - -
a96135c0 by Tristan Matthews at 2025-08-03T05:26:14+00:00
contrib: png: update to 1.6.39

On 32-bit ARM, the cmake default is now -DPNG_ARM_NEON=off so we do runtime
detection for platforms where it's not already hard enabled.

(cherry picked from commit 2a242c29b2445899584ae09abdba7a55dac7d603)

- - - - -
2b8ef26f by Tristan Matthews at 2025-08-03T05:26:14+00:00
contrib: png: update to 1.6.40

Changes from version 1.6.39 to version 1.6.40
---------------------------------------------

 * Fixed the eXIf chunk multiplicity checks.
 * Fixed a memory leak in pCAL processing.
 * Corrected the validity report about tRNS inside png_get_valid().
 * Fixed various build issues on *BSD, Mac and Windows.
 * Updated the configurations and the scripts for continuous integration.
 * Cleaned up the code, the build scripts, and the documentation.

See:
https://sourceforge.net/p/libpng/code/ci/libpng16/tree/ANNOUNCE
(cherry picked from commit 12787876b36d0db2abefb4c6714585a407ea47c1)

- - - - -
8ac9d467 by Steve Lhomme at 2025-08-03T05:26:14+00:00
contrib: png: fix update from older installed version

When you have an old png+zlib in your path, it was using that
to detect the PNG/ZLIB incompatibility instead of using the
local pnglibconf.h

(cherry picked from commit 5a75966b395d13cab0fa082e50e34b36a554840a)

- - - - -
f56486f7 by Tristan Matthews at 2025-08-03T05:26:14+00:00
contrib: png: update to libpng 1.6.44

(cherry picked from commit 04f140a9d0c6a40bc999e1fa2f973680d9109b5b)

- - - - -
baeaaeec by Maxime Chapelet at 2025-08-03T05:26:14+00:00
contribs: png: disable debug lib suffix for all platforms

Given contribs are bootstrapped with `--disable-optimizations` option,
the CMAKE flag `-DCMAKE_BUILD_TYPE` is set to `Debug`, and when
build configuration is set to `Debug` in libpng contrib, it CMAKE
configuration append a `d` char to the static library name,
resulting in a lib named `libpng16d.a` instead of `libpng16.a`.
Then some vlc module depending on libpng aren't able to link
properly as they can't find their lpng16 dependency.

(cherry picked from commit 9858ba5d19d0aa5dafd779be307f951cb1273589)

- - - - -
d03d8e7f by Tristan Matthews at 2025-08-03T05:26:14+00:00
contrib: png: update to 1.6.46

(cherry picked from commit d05a600c4b27e28d73ed91aa34714f3027e3da7c)

- - - - -
29b00a3c by Tristan Matthews at 2025-08-03T05:26:14+00:00
contrib: png: update to 1.6.49

This release "includes a fix for a floating-point bug in the setter of the mDCv chunk."

(cherry picked from commit 2d3763a8780ca48ec415f11708d81110fa60558a)

- - - - -
7954edab by Tristan Matthews at 2025-08-03T05:26:14+00:00
contrib: png: update to 1.6.50

(cherry picked from commit debf83ba467c2c302510acdfa4b5ef9049678fae)

- - - - -
47737025 by Steve Lhomme at 2025-08-03T05:26:14+00:00
contrib: freetype2: build with CMake

So we don't use a home made build system that doesn't allow out of tree builds.

(cherry picked from commit d9c9482b253762312bcb5c0ab5043e34bb23575f)

- - - - -
b4656157 by Steve Lhomme at 2025-08-03T05:26:14+00:00
contrib: freetype2: disable building doc and brotli

Fix regression from d9c9482b253762312bcb5c0ab5043e34bb23575f

Ref. #27365

(cherry picked from commit 0afd81965307eb0b767538e9506a3c03661accb6)

- - - - -
8c62ca27 by Johannes Kauffmann at 2025-08-03T05:26:14+00:00
contrib: freetype: actually disable bzip2

Regression from d9c9482b253762312bcb5c0ab5043e34bb23575f.

This fixes linking on macOS with static Qt from contribs:

Undefined symbols for architecture x86_64:
  "_BZ2_bzDecompress", referenced from:
      _ft_bzip2_file_fill_output in libfreetype.a(ftbzip2.c.o)
  "_BZ2_bzDecompressEnd", referenced from:
      _ft_bzip2_stream_io in libfreetype.a(ftbzip2.c.o)
      _ft_bzip2_stream_close in libfreetype.a(ftbzip2.c.o)
  "_BZ2_bzDecompressInit", referenced from:
      _FT_Stream_OpenBzip2 in libfreetype.a(ftbzip2.c.o)
      _ft_bzip2_stream_io in libfreetype.a(ftbzip2.c.o)
ld: symbol(s) not found for architecture x86_64

(cherry picked from commit 0f6b7fab25d8c79f078b0c7b7a98ea4ebe3e2b5a)

- - - - -


30 changed files:

- contrib/src/SDL_image/rules.mak
- contrib/src/a52/rules.mak
- contrib/src/aribb24/rules.mak
- contrib/src/aribb25/rules.mak
- contrib/src/asdcplib/rules.mak
- contrib/src/ass/rules.mak
- contrib/src/bluray/rules.mak
- contrib/src/breakpad/rules.mak
- contrib/src/caca/rules.mak
- contrib/src/cddb/rules.mak
- contrib/src/daala/rules.mak
- contrib/src/dca/rules.mak
- contrib/src/dvbpsi/rules.mak
- contrib/src/dvdcss/rules.mak
- contrib/src/dvdnav/rules.mak
- contrib/src/dvdread/rules.mak
- contrib/src/faad2/rules.mak
- contrib/src/ffi/rules.mak
- contrib/src/ffmpeg/rules.mak
- contrib/src/flac/rules.mak
- contrib/src/fontconfig/rules.mak
- contrib/src/freetype2/rules.mak
- contrib/src/gcrypt/rules.mak
- contrib/src/gettext/rules.mak
- contrib/src/glib/rules.mak
- contrib/src/gmp/rules.mak
- contrib/src/gnutls/rules.mak
- contrib/src/goom/rules.mak
- contrib/src/gpg-error/rules.mak
- contrib/src/gsm/rules.mak


The diff was not included because it is too large.


View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/dc88699432b582b0d4193d0abd46c7cdca3a5616...8c62ca272d8f907c7e344c473776e12d2f2451dc

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/dc88699432b582b0d4193d0abd46c7cdca3a5616...8c62ca272d8f907c7e344c473776e12d2f2451dc
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