Steve Lhomme pushed to branch 3.0.x at VideoLAN / VLC
Commits:
ef16d653 by Sean McGovern at 2026-01-24T11:48:21+00:00
livehttp: ceil() requires linking with libm
Signed-off-by: Thomas Guillem <[email protected]>
(cherry picked from commit 592fe99580fb13eead0c81ee16e4fbd68b75f6c3)
- - - - -
83d166ca by Steve Lhomme at 2026-01-24T11:48:21+00:00
autoconf: detect gpg-error to get dependencies
On Windows it requires ws2_32.
(cherry picked from commit 0c72a6c71c21b50d948e5045dbd00a606e1e5ca7)
- - - - -
2 changed files:
- configure.ac
- modules/access_output/Makefile.am
Changes:
=====================================
configure.ac
=====================================
@@ -4331,6 +4331,11 @@ AS_IF([test "${enable_libgcrypt}" != "no"], [
AS_IF([test "${ac_cv_lib_gcrypt}" = "yes"], [
AC_DEFINE([HAVE_GCRYPT], 1, [Defined if having gcrypt])
+ PKG_CHECK_MODULES([GPGERROR], [gpg-error], [
+ have_gpg_error="yes"
+ ], [
+ have_gpg_error="no"
+ ])
], [
AS_IF([test "${enable_libgcrypt}" = "yes"], [
AC_MSG_ERROR([libgcrypt version 1.6.0 or higher not found. Install
libgcrypt or pass --disable-libgcrypt.])
@@ -4339,7 +4344,11 @@ AS_IF([test "${enable_libgcrypt}" != "no"], [
])
AS_IF([test -z "$GCRYPT_LIBS"], [
- GCRYPT_LIBS="-lgcrypt -lgpg-error"
+ AS_IF([test "${have_gpg_error}" = "yes"],[
+ GCRYPT_LIBS="-lgcrypt ${GPGERROR_LIBS}"
+ ],[
+ GCRYPT_LIBS="-lgcrypt -lgpg-error"
+ ])
])
AC_SUBST(GCRYPT_CFLAGS)
=====================================
modules/access_output/Makefile.am
=====================================
@@ -15,7 +15,7 @@ access_out_LTLIBRARIES = \
libaccess_output_livehttp_plugin_la_SOURCES = access_output/livehttp.c
libaccess_output_livehttp_plugin_la_CFLAGS = $(AM_CFLAGS) $(GCRYPT_CFLAGS)
-libaccess_output_livehttp_plugin_la_LIBADD = $(GCRYPT_LIBS) -lgpg-error
+libaccess_output_livehttp_plugin_la_LIBADD = $(GCRYPT_LIBS) $(LIBM)
if HAVE_GCRYPT
access_out_LTLIBRARIES += libaccess_output_livehttp_plugin.la
endif
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/compare/9aa96cb740047bf6dcc1c26d2c5923e3020f5679...83d166ca1b4b3862211bc886b42d70954848848f
--
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/compare/9aa96cb740047bf6dcc1c26d2c5923e3020f5679...83d166ca1b4b3862211bc886b42d70954848848f
You're receiving this email because of your account on code.videolan.org.
VideoLAN code repository instance_______________________________________________
vlc-commits mailing list
[email protected]
https://mailman.videolan.org/listinfo/vlc-commits
