[vlc-commits] [Git][videolan/vlc][master] tools: fix build when iconv is not detected+working on the system

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch master at VideoLAN / VLC


Commits:
7f23d9fa by Steve Lhomme at 2025-10-26T04:37:15+00:00
tools: fix build when iconv is not detected+working on the system

- the signature of iconv_ostream__flush() doesn't match the header
- iconv_ostream_create() is missing

- - - - -


2 changed files:

- + extras/tools/gettext-no-iconv.patch
- extras/tools/tools.mak


Changes:

=====================================
extras/tools/gettext-no-iconv.patch
=====================================
@@ -0,0 +1,25 @@
+--- gettext/libtextstyle/lib/iconv-ostream.c.orig	2025-10-22 13:15:49
++++ gettext/libtextstyle/lib/iconv-ostream.c	2025-10-22 13:15:54
+@@ -245,7 +245,7 @@ static void
+ }
+ 
+ static void
+-iconv_ostream__flush (iconv_ostream_t stream)
++iconv_ostream__flush (iconv_ostream_t stream, ostream_flush_scope_t scope)
+ {
+   abort ();
+ }
+@@ -256,6 +256,13 @@ iconv_ostream__free (iconv_ostream_t stream)
+   abort ();
+ }
+ 
++iconv_ostream_t
++iconv_ostream_create (const char *from_encoding, const char *to_encoding,
++                      ostream_t destination)
++{
++  return NULL;
++}
++
+ /* Accessors.  */
+ 
+ static const char *


=====================================
extras/tools/tools.mak
=====================================
@@ -387,6 +387,7 @@ gettext-$(GETTEXT_VERSION).tar.gz:
 
 gettext: gettext-$(GETTEXT_VERSION).tar.gz
 	$(UNPACK)
+	$(APPLY) $(TOOLS)/gettext-no-iconv.patch
 	$(MOVE)
 
 .buildgettext: gettext



View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/7f23d9fa21d4f353a10fec666423ec23c5477807

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/7f23d9fa21d4f353a10fec666423ec23c5477807
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance