[vlc-commits] [Git][videolan/vlc][master] 3 commits: contrib: flac: disable iconv usage

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch master at VideoLAN / VLC


Commits:
b99d33bc by Steve Lhomme at 2024-06-28T11:36:10+00:00
contrib: flac: disable iconv usage

Otherwise we need to depend on the iconv package, but we never did that.

- - - - -
00a77037 by Steve Lhomme at 2024-06-28T11:36:10+00:00
contrib: cddb: remove AM_ICONV dependency

Similar to 637d00420fa1a3f4b71215ba869cb5d05bb7bead.

This reverts commit deeabe12142d75910ebafc49b26dc2a0ab056deb.

- - - - -
d07639aa by Steve Lhomme at 2024-06-28T11:36:10+00:00
contrib: cddb: add internal library dependencies to pkg-config

On windows that's regex and ws2_32

- - - - -


3 changed files:

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


Changes:

=====================================
contrib/src/cddb/rules.mak
=====================================
@@ -23,12 +23,14 @@ cddb: libcddb-$(CDDB_VERSION).tar.bz2 .sum-cddb
 	$(APPLY) $(SRC)/cddb/cddb-no-alarm.patch
 	$(APPLY) $(SRC)/cddb/fix-header-guards.patch
 	$(APPLY) $(SRC)/cddb/no-gettext.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/^AM_ICONV/#&/' $(UNPACK_DIR)/configure.ac
+	# add internal dependencies
+	sed -i.orig 's/-lcddb @LIBICONV@/-lcddb @LIBICONV@ @LIBS@/' $(UNPACK_DIR)/libcddb.pc.in
 	$(MOVE)
 
-DEPS_cddb = regex $(DEPS_regex) gettext $(DEPS_gettext)
+DEPS_cddb = regex $(DEPS_regex)
 
 CDDB_CONF := --without-iconv
 


=====================================
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}


=====================================
contrib/src/flac/rules.mak
=====================================
@@ -29,7 +29,8 @@ FLAC_CONF = \
 	-DBUILD_CXXLIBS=OFF \
 	-DBUILD_EXAMPLES=OFF \
 	-DBUILD_PROGRAMS=OFF \
-	-DBUILD_DOCS=OFF
+	-DBUILD_DOCS=OFF \
+	-DCMAKE_DISABLE_FIND_PACKAGE_Iconv=ON
 
 ifeq ($(ARCH),i386)
 # nasm doesn't like the -fstack-protector-strong that's added to its flags



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/4122407e20d24018575662319d9768540240530a...d07639aabbf20509e42c74f7e2e9eeef27197a23

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


VideoLAN code repository instance