From: Brad Smith <brad@comstyle.com>
Subject: Re: UPDATE: VLC
To: ports@openbsd.org
Date: Sat, 1 Mar 2025 22:24:21 -0500

ping.

On 2025-02-17 7:31 a.m., Brad Smith wrote:
> NFC, just back porting some autoconf fixes for libexecinfo and libass.
>
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/x11/vlc/Makefile,v
> retrieving revision 1.279
> diff -u -p -u -p -r1.279 Makefile
> --- Makefile	7 Feb 2025 15:19:46 -0000	1.279
> +++ Makefile	17 Feb 2025 12:24:45 -0000
> @@ -226,7 +226,6 @@ CONFIGURE_ARGS+=--disable-a52 \
>   CONFIGURE_ENV+=	BUILDCC="${CC}" \
>   		CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \
>   		LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib" \
> -		LIBS_libvlccore="-lexecinfo" \
>   		PKG_CONFIG_PATH="${LOCALBASE}/lib/qt5/pkgconfig" \
>   		RCC="${LOCALBASE}/bin/rcc-qt5" \
>   		LUAC="${LOCALBASE}/bin/luac${MODLUA_DEP_VERSION}"
> Index: patches/patch-configure_ac
> ===================================================================
> RCS file: /cvs/ports/x11/vlc/patches/patch-configure_ac,v
> retrieving revision 1.45
> diff -u -p -u -p -r1.45 patch-configure_ac
> --- patches/patch-configure_ac	20 Feb 2024 11:51:13 -0000	1.45
> +++ patches/patch-configure_ac	17 Feb 2025 12:24:45 -0000
> @@ -1,3 +1,8 @@
> +- libass: fix fontconfig detection
> +  d19599c42141eaf72cae9a0cb21b5889cd01c860
> +- configure: look for backtrace() in libexecinfo
> +  b3179e1e0993b8c15b735c93282c7675632c183c
> +
>   Index: configure.ac
>   --- configure.ac.orig
>   +++ configure.ac
> @@ -34,7 +39,24 @@ Index: configure.ac
>      dnl Check for fast maths
>      AX_APPEND_COMPILE_FLAGS([-fno-math-errno -funsafe-math-optimizations -fno-rounding-math -fno-signaling-nans -fcx-limited-range], [CFLAGS])
>      AX_APPEND_COMPILE_FLAGS([-fno-math-errno -funsafe-math-optimizations -fno-rounding-math -fno-signaling-nans -fcx-limited-range], [CXXFLAGS])
> -@@ -1668,7 +1651,7 @@ AC_ARG_ENABLE(lua,
> +@@ -1246,9 +1229,14 @@ case "${host_cpu}" in
> + esac
> +
> + dnl Check for backtrace() support
> +-AC_CHECK_HEADERS(execinfo.h)
> +-AC_CHECK_FUNCS(backtrace)
> ++AC_CHECK_HEADERS([execinfo.h])
> ++AC_CHECK_FUNCS([backtrace],, [
> ++  AC_CHECK_LIB([execinfo], [backtrace], [
> ++    LIBEXECINFO="-lexecinfo"])
> ++])
> ++AC_SUBST(LIBEXECINFO)
> +
> ++
> + dnl
> + dnl  default modules
> + dnl
> +@@ -1668,7 +1656,7 @@ AC_ARG_ENABLE(lua,
>        [disable LUA scripting support (default enabled)])])
>    if test "${enable_lua}" != "no"
>    then
> @@ -43,3 +65,55 @@ Index: configure.ac
>        [ have_lua=yes ],
>        [
>        AC_MSG_WARN([${LUA_PKG_ERRORS}, trying lua 5.1 instead])
> +@@ -2989,25 +2977,6 @@ AS_IF( [test "${enable_telx}" != "no" ],[
> +   ])
> +
> + dnl
> +-dnl libass subtitle rendering module
> +-dnl
> +-AC_ARG_ENABLE(libass,
> +-  [  --enable-libass         Subtitle support using libass (default enabled)])
> +-AS_IF( [test "${enable_libass}" != "no"], [
> +-  PKG_CHECK_MODULES(LIBASS, [libass >= 0.9.8],
> +-      [
> +-        VLC_ADD_PLUGIN([libass])
> +-
> +-        AC_CHECK_HEADERS(fontconfig/fontconfig.h,
> +-          [VLC_ADD_CPPFLAGS([libass],[-DHAVE_FONTCONFIG])
> +-           VLC_ADD_LIBS([libass],[-lfontconfig])
> +-       ])
> +-      ],[
> +-        AC_MSG_WARN([${LIBASS_PKG_ERRORS}.])
> +-      ])
> +-  ])
> +-
> +-dnl
> + dnl ARIB subtitles rendering module
> + dnl
> + AC_ARG_ENABLE(aribsub,
> +@@ -3346,6 +3315,25 @@ AM_CONDITIONAL([HAVE_FREETYPE], [test "${have_freetype
> + AM_CONDITIONAL([HAVE_FONTCONFIG], [test "${have_fontconfig}" = "yes"])
> + AM_CONDITIONAL([HAVE_FRIBIDI], [test "${have_fribidi}" = "yes"])
> + AM_CONDITIONAL([HAVE_HARFBUZZ], [test "${have_harfbuzz}" = "yes"])
> ++
> ++dnl
> ++dnl libass subtitle rendering module
> ++dnl
> ++AC_ARG_ENABLE(libass,
> ++  [  --enable-libass         Subtitle support using libass (default enabled)])
> ++AS_IF( [test "${enable_libass}" != "no"], [
> ++  PKG_CHECK_MODULES(LIBASS, [libass >= 0.9.8],
> ++      [
> ++        VLC_ADD_PLUGIN([libass])
> ++
> ++        if test "${have_fontconfig}" != "no"; then
> ++            VLC_ADD_CPPFLAGS([libass],[-DHAVE_FONTCONFIG])
> ++            VLC_ADD_LIBS([libass],[${FONTCONFIG_LIBS}])
> ++        fi
> ++      ],[
> ++        AC_MSG_WARN([${LIBASS_PKG_ERRORS}.])
> ++      ])
> ++  ])
> +
> + dnl
> + dnl SAPI (text to Speech renderer for Windows)
> Index: patches/patch-src_Makefile_am
> ===================================================================
> RCS file: patches/patch-src_Makefile_am
> diff -N patches/patch-src_Makefile_am
> --- /dev/null	1 Jan 1970 00:00:00 -0000
> +++ patches/patch-src_Makefile_am	17 Feb 2025 12:24:45 -0000
> @@ -0,0 +1,14 @@
> +- configure: look for backtrace() in libexecinfo
> +  b3179e1e0993b8c15b735c93282c7675632c183c
> +
> +Index: src/Makefile.am
> +--- src/Makefile.am.orig
> ++++ src/Makefile.am
> +@@ -419,6 +419,7 @@ libvlccore_la_SOURCES += \
> + 	darwin/specific.c \
> + 	darwin/thread.c
> + else
> ++libvlccore_la_LIBADD += $(LIBEXECINFO)
> + libvlccore_la_SOURCES += \
> + 	posix/dirs.c \
> + 	posix/error.c \