contrib: ncurses: update to 6.5
Fixes a build issue related to pkg-config paths:
checking for pkg-config... /Users/user/Projects/VideoLAN/vlc/extras/tools/build/bin/pkg-config
checking for /Users/user/Projects/VideoLAN/vlc/extras/tools/build/bin/pkg-config library directory... checking for search-list...
checking for first directory... none
checking if we should install .pc files for /Users/user/Projects/VideoLAN/vlc/extras/tools/build/bin/pkg-config... yes
configure: error: expected a pathname, not ""
Edited by Marvin Scholz
Merge request reports
Activity
Filter activity
assigned to @ePirat
changed milestone to %4.0
added Component::Build system: Contribs label
added MRStatus::Reviewable label
added MRStatus::Acceptable label and removed MRStatus::Reviewable label
@@ -1685,19 +1692,36 @@ rm -f core]) test "$cf_cv_func_curses_version" = yes && AC_DEFINE(HAVE_CURSES_VERSION,1,[Define to 1 if we have curses_version function]) ]) dnl --------------------------------------------------------------------------- -dnl CF_FUNC_GETTIME version: 2 updated: 2023/02/25 08:45:56 +dnl CF_FUNC_GETTIME version: 3 updated: 2024/05/11 13:40:02 dnl --------------- dnl Check for gettimeofday or clock_gettime. In 2023, the former is still more dnl widely supported, but "deprecated" (2008), so we will use the latter if it dnl is available, to reduce compiler warnings. AC_DEFUN([CF_FUNC_GETTIME],[ -AC_CACHE_CHECK(for clock_gettime,cf_cv_func_clock_gettime,[ - AC_TRY_LINK([#include <time.h>], +cf_save_libs="$LIBS" +AC_CHECK_FUNC(clock_gettime, + cf_cv_test_clock_gettime=yes, + AC_CHECK_LIB(rt, clock_gettime, + [LIBS="-lrt $LIBS" + cf_cv_test_clock_gettime=yes], + cf_cv_test_clock_gettime=no)) + +if test "$cf_cv_test_clock_gettime" = yes ; then +AC_CACHE_CHECK(if clock_gettime links,cf_cv_func_clock_gettime,[ + AC_TRY_LINK([ +$ac_includes_default +#include <time.h> + ], [struct timespec ts; - int rc = clock_gettime(CLOCK_REALTIME, &ts); (void) rc; (void)ts], + int rc = clock_gettime(CLOCK_REALTIME, &ts) + + clock_gettime(CLOCK_MONOTONIC, &ts); + (void) rc; (void)ts], [cf_cv_func_clock_gettime=yes], [cf_cv_func_clock_gettime=no]) ]) +else + cf_cv_func_clock_gettime=no +fi if test "$cf_cv_func_clock_gettime" = yes then
This is a weird integration in ncurses
, but the variable looks correctly used here.added MRStatus::Accepted label and removed MRStatus::Acceptable label
MR Acceptance result
This MergeRequest has been Accepted! Congratulations.MR acceptance checks details:
-
MR should be considered mergeable by Gitlab -
Last pipeline should be successful -
MergeRequest should have at least one external review and/or vote -
All threads should be resolved, and score >= 0 -
MergeRequest should have no activity (threads/votes) for (24h/24h)
-
added 7 commits
-
0334f897...826ae377 - 6 commits from branch
videolan:master
- 062929a6 - contrib: ncurses: update to 6.5
-
0334f897...826ae377 - 6 commits from branch
enabled an automatic merge when all merge checks for 062929a6 pass
Please register or sign in to reply