[vlc-commits] [Git][videolan/vlc][3.0.x] 2 commits: contrib: zvbi: fix __va_copy() usage

[Steve Lhomme (@robUx4)]

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


Commits:
e05d859a by Sean McGovern at 2025-07-28T11:47:02+02:00
contrib: zvbi: fix __va_copy() usage

(cherry picked from commit beebc0dec083be5cc5583d5356a6ce89e19d27ee)

- - - - -
7ad9339a by Steve Lhomme at 2025-07-28T11:47:02+02:00
contrib: zvbi: don't keep the full iconv path

It disturbs libtool.

(cherry picked from commit f0e3a36f562a23fa19be0e84d6a9dc5499433ceb)

- - - - -


3 changed files:

- + contrib/src/zvbi/0001-configure-hardcode-liconv-instead-of-the-full-path.patch
- contrib/src/zvbi/rules.mak
- + contrib/src/zvbi/zvbi-va_copy.patch


Changes:

=====================================
contrib/src/zvbi/0001-configure-hardcode-liconv-instead-of-the-full-path.patch
=====================================
@@ -0,0 +1,30 @@
+From 9d3e264119fdcbe0598fe637d18c66ebf0731cfc Mon Sep 17 00:00:00 2001
+From: Steve Lhomme <robux4 at ycbcr.xyz>
+Date: Tue, 16 Apr 2024 07:59:13 +0200
+Subject: [PATCH] configure: hardcode -liconv instead of the full path
+
+It disturbs libtool when adding a .a as a file to link with.
+
+png and libz are already hardcoded.
+---
+ configure.in | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/configure.in b/configure.in
+index 25e6aa7..62fd0c9 100644
+--- a/configure.in
++++ b/configure.in
+@@ -236,7 +236,9 @@ AM_ICONV_LINK
+ if test "x$am_cv_func_iconv" != xyes; then
+   AC_MSG_ERROR([iconv() not found])
+ fi
+-LIBS="$LIBS $LIBICONV"
++if test "$am_cv_lib_iconv" = yes; then
++LIBS="$LIBS -liconv"
++fi
+ 
+ dnl
+ dnl Check for png library.
+-- 
+2.37.3.windows.1
+


=====================================
contrib/src/zvbi/rules.mak
=====================================
@@ -23,9 +23,12 @@ ifdef HAVE_WIN32
 	$(APPLY) $(SRC)/zvbi/zvbi-win32-undefined.patch
 endif
 	$(APPLY) $(SRC)/zvbi/zvbi-fix-clang-support.patch
+	$(APPLY) $(SRC)/zvbi/zvbi-va_copy.patch
 ifdef HAVE_ANDROID
 	$(APPLY) $(SRC)/zvbi/zvbi-android.patch
 endif
+	# hardcode -liconv instead of the full path
+	$(APPLY) $(SRC)/zvbi/0001-configure-hardcode-liconv-instead-of-the-full-path.patch
 	# check for pthread_create in pthreads as well
 	sed -i.orig "s/AC_CHECK_LIB(pthread, pthread_create,,/AC_SEARCH_LIBS([pthread_create], [pthread pthreads],,/" $(UNPACK_DIR)/configure.in
 	$(MOVE)
@@ -52,5 +55,4 @@ endif
 	cd $< && $(HOSTVARS) ./configure $(HOSTCONF) $(ZVBICONF)
 	cd $< && $(MAKE) -C src install
 	cd $< && $(MAKE) SUBDIRS=. install
-	sed -i.orig -e "s/\/[^ ]*libiconv.a/-liconv/" $(PREFIX)/lib/pkgconfig/zvbi-0.2.pc
 	touch $@


=====================================
contrib/src/zvbi/zvbi-va_copy.patch
=====================================
@@ -0,0 +1,13 @@
+--- zvbi/src/misc.h.ORIG	2013-07-01 22:32:31.000000000 -0400
++++ zvbi/src/misc.h	2021-09-01 23:30:14.400736405 -0400
+@@ -424,7 +424,9 @@
+ #endif
+ 
+ /* __va_copy is a GNU extension. */
+-#ifndef __va_copy
++#ifdef va_copy && !defined(__va_copy)
++#  define __va_copy va_copy
++#else
+ #  define __va_copy(ap1, ap2) do { ap1 = ap2; } while (0)
+ #endif
+ 



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/da391be597edb7bebf1f153eb41d567d6ed0fa64...7ad9339a5fbd0976159cea3e6c568ff0b6835dcc

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


VideoLAN code repository instance