[vlc-commits] [Git][videolan/vlc][3.0.x] 4 commits: contrib: cddb: add dependency to gettext

[Steve Lhomme (@robUx4)]

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


Commits:
18eabca4 by Alexandre Janniaux at 2026-04-21T11:50:17+02:00
contrib: cddb: add dependency to gettext

cddb buildsystem, in particular configure.ac, is using macros from
gettext.m4, which might not be available on non-GNU systems like the
Darwin ones.

When gettext is installed on those systems, the macro file can be
imported using the aclocal's -I parameter or using the ACLOCAL_PATH
environment variable.

When neither is done, even with gettext in the PATH, the configure.ac
won't be able to call AM_ICONV and will trigger the following error.

    configure.ac:130: warning: macro 'AM_ICONV' not found in library
    autoreconf: configure.ac: tracing
    autoreconf: running: libtoolize --copy --force
    libtoolize: putting auxiliary files in '.'.
    libtoolize: copying file './ltmain.sh'
    libtoolize: Consider adding 'AC_CONFIG_MACRO_DIRS([m4])' to configure.ac,
    libtoolize: and rerunning libtoolize and aclocal.
    libtoolize: Consider adding '-I m4' to ACLOCAL_AMFLAGS in Makefile.am.
    configure.ac:130: warning: macro 'AM_ICONV' not found in library
    autoreconf: running: /Users/unidan/Workspace/vlc/extras/tools/build/bin/autoconf --include=/Users/unidan/Workspace/vlc/contrib/aarch64-linux-android/share/aclocal --include=/Users/unidan/Workspace/vlc/extras/tools/build/share/aclocal --force
    configure.ac:130: error: possibly undefined macro: AM_ICONV
          If this token and others are legitimate, please use m4_pattern_allow.
          See the Autoconf documentation.

With the gettext contrib, the gettext.m4 will be installed into the
directory $(PREFIX)/share/aclocal/gettext.m4, and aclocal will be called
with `-I $(PREFIX)/share/aclocal/` which solves the issue here.

(cherry picked from commit deeabe12142d75910ebafc49b26dc2a0ab056deb) (rebased)
rebased:
- the code around is slightly different
Signed-off-by: Steve Lhomme <robux4 at ycbcr.xyz>

- - - - -
526bb1d4 by Steve Lhomme at 2026-04-21T11:50:49+02:00
contrib: cddb: remove AM_ICONV dependency

Similar to 637d00420fa1a3f4b71215ba869cb5d05bb7bead.

This reverts commit deeabe12142d75910ebafc49b26dc2a0ab056deb.

(cherry picked from commit 00a77037c618df0b08f352d8d3cf967702651875) (rebased)
rebased:
- VLC 3 already has the patch for GCC14
Signed-off-by: Steve Lhomme <robux4 at ycbcr.xyz>

- - - - -
5cf998e1 by Steve Lhomme at 2026-04-21T11:51:13+02:00
contrib: cddb: add internal library dependencies to pkg-config

On windows that's regex and ws2_32

(cherry picked from commit d07639aabbf20509e42c74f7e2e9eeef27197a23)
Signed-off-by: Steve Lhomme <robux4 at ycbcr.xyz>

- - - - -
9d946bb2 by Marvin Scholz at 2026-04-21T11:51:13+02:00
contrib: fix cddb mistakenly depending on iconv

Currently there are two issues here, one hiding the other:

- The sed pattern is wrong, causing it to not match due to leading
  spaces.
- The replacement for the second sed pattern is wrong, not removing
  the @LIBICONV@, causing it to be present in the generated .pc, but
  due to the previous issue, this was hidden as the iconv detection was
  never actually removed.

This issue only rarely manifested, as we also build iconv in contribs,
so it was totally depending on build order if this caused any issue or
not.

(cherry picked from commit 9cff68f0c37e42820b91b33d33f47827830c9b15) (rebased)
rebased:
- VLC 3 already has the patch for GCC14
Signed-off-by: Steve Lhomme <robux4 at ycbcr.xyz>

- - - - -


2 changed files:

- contrib/src/cddb/rules.mak
- − contrib/src/cddb/win32-pkg.patch


Changes:

=====================================
contrib/src/cddb/rules.mak
=====================================
@@ -24,9 +24,11 @@ cddb: libcddb-$(CDDB_VERSION).tar.bz2 .sum-cddb
 	$(APPLY) $(SRC)/cddb/fix-header-guards.patch
 	$(APPLY) $(SRC)/cddb/no-gettext.patch
 	$(APPLY) $(SRC)/cddb/cddb-gcc14-getsockoptfix.patch
-ifdef HAVE_WIN32
-	$(APPLY) $(SRC)/cddb/win32-pkg.patch
-endif
+	# Avoid relying on iconv.m4 from gettext, when reconfiguring.
+	# This is only used by the frontend which we disable.
+	sed -i.orig 's/^[[:blank:]]*AM_ICONV/#&/' $(UNPACK_DIR)/configure.ac
+	# add internal dependencies
+	sed -i.orig 's/-lcddb @LIBICONV@/-lcddb @LIBS@/' $(UNPACK_DIR)/libcddb.pc.in
 	$(MOVE)
 
 DEPS_cddb = regex $(DEPS_regex)


=====================================
contrib/src/cddb/win32-pkg.patch deleted
=====================================
@@ -1,9 +0,0 @@
---- libcddb/libcddb.pc.in.orig	2009-10-25 21:36:57.000000000 +0100
-+++ libcddb/libcddb.pc.in	2009-10-25 21:36:11.000000000 +0100
-@@ -6,5 +6,5 @@
- Name: libcddb
- Description: CDDB server access library
- Version: @VERSION@
--Libs: -L${libdir} -lcddb @LIBICONV@
-+Libs: -L${libdir} -lcddb -lregex ${libdir}/libregex.a @LIBICONV@ -lws2_32
- Cflags: -I${includedir}



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/9773f695cdcc448dce07c86074c97a9129eb80b2...9d946bb238d89299ee11a94059ebc6254efa3983

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/9773f695cdcc448dce07c86074c97a9129eb80b2...9d946bb238d89299ee11a94059ebc6254efa3983
You're receiving this email because of your account on code.videolan.org.