[vlc-commits] [Git][videolan/vlc][master] 4 commits: contrib: taglib: rename utfcpp internal target

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch master at VideoLAN / VLC


Commits:
d2d9f596 by Steve Lhomme at 2026-08-06T04:41:17+00:00
contrib: taglib: rename utfcpp internal target

To make room for the real utfcpp contrib.

- - - - -
5d26404d by Steve Lhomme at 2026-08-06T04:41:17+00:00
contrib: add utfcpp library

It's used by libebml and taglib.

- - - - -
13e9942a by Steve Lhomme at 2026-08-06T04:41:17+00:00
contrib: taglib: depend on utfcpp contrib

Rather than extracting it internally.

- - - - -
8126075b by Steve Lhomme at 2026-08-06T04:41:17+00:00
contrib: ebml: depend on utfcpp contrib

So it's not downloaded via CMake, which seems to fail in flatpack.

- - - - -


5 changed files:

- contrib/src/ebml/rules.mak
- contrib/src/taglib/SHA512SUMS
- contrib/src/taglib/rules.mak
- + contrib/src/utfcpp/SHA512SUMS
- + contrib/src/utfcpp/rules.mak


Changes:

=====================================
contrib/src/ebml/rules.mak
=====================================
@@ -7,6 +7,8 @@ ifeq ($(call need_pkg,"libebml >= 1.3.8"),)
 PKGS_FOUND += ebml
 endif
 
+DEPS_ebml := utfcpp $(DEPS_utfcpp)
+
 $(TARBALLS)/libebml-$(EBML_VERSION).tar.xz:
 	$(call download_pkg,$(EBML_URL),ebml)
 


=====================================
contrib/src/taglib/SHA512SUMS
=====================================
@@ -1,2 +1 @@
 5bf3e2b73d9c6eb2e9262f5f64a2adb4d350b6fa19656372c962319eb24122fbb9f6bb13ec3763c6cea4b9e92de39c822870fbf7e426f4bf70114e16333c3e1b  taglib-2.3.tar.gz
-1ce12c8158a2f3bcddec104ceacedaea4031b4c88fc0fa1f1fae8dfa8df81c846861df9d01e8f294d79b9e4ab8c51bd1289f404eed24d07abc760688fee13090  utfcpp-3.2.5.tar.gz


=====================================
contrib/src/taglib/rules.mak
=====================================
@@ -3,40 +3,29 @@
 TAGLIB_VERSION := 2.3
 TAGLIB_URL := $(GITHUB)/taglib/taglib/releases/download/v$(TAGLIB_VERSION)/taglib-$(TAGLIB_VERSION).tar.gz
 
-UTFCPP_VERSION := 3.2.5
-UTFCPP_URL := $(GITHUB)/nemtrif/utfcpp/archive/refs/tags/v$(UTFCPP_VERSION).tar.gz
-
 PKGS += taglib
 ifeq ($(call need_pkg,"taglib >= 1.9"),)
 PKGS_FOUND += taglib
 endif
 
+DEPS_taglib := utfcpp $(DEPS_utfcpp)
+
 $(TARBALLS)/taglib-$(TAGLIB_VERSION).tar.gz:
 	$(call download_pkg,$(TAGLIB_URL),taglib)
 
-$(TARBALLS)/utfcpp-$(UTFCPP_VERSION).tar.gz:
-	$(call download_pkg,$(UTFCPP_URL),utfcpp)
-
-.sum-taglib: taglib-$(TAGLIB_VERSION).tar.gz utfcpp-$(UTFCPP_VERSION).tar.gz
-
-.sum-utfcpp: .sum-taglib
-	touch $@
+.sum-taglib: taglib-$(TAGLIB_VERSION).tar.gz
 
 taglib: taglib-$(TAGLIB_VERSION).tar.gz .sum-taglib
 	$(UNPACK)
 	$(MOVE)
 
-taglib/3rdparty/utfcpp: utfcpp-$(UTFCPP_VERSION).tar.gz .sum-utfcpp taglib
-	$(UNPACK)
-	$(MOVE)
-
 TAGLIB_CONF := -DBUILD_BINDINGS=OFF
 ifdef HAVE_WINSTORE
 TAGLIB_CONF += -DPLATFORM_WINRT=ON
 endif
 
 
-.taglib: taglib taglib/3rdparty/utfcpp toolchain.cmake
+.taglib: taglib toolchain.cmake
 	$(CMAKECLEAN)
 	$(HOSTVARS_CMAKE) $(CMAKE) $(TAGLIB_CONF)
 	+$(CMAKEBUILD)


=====================================
contrib/src/utfcpp/SHA512SUMS
=====================================
@@ -0,0 +1 @@
+1ce12c8158a2f3bcddec104ceacedaea4031b4c88fc0fa1f1fae8dfa8df81c846861df9d01e8f294d79b9e4ab8c51bd1289f404eed24d07abc760688fee13090  utfcpp-3.2.5.tar.gz


=====================================
contrib/src/utfcpp/rules.mak
=====================================
@@ -0,0 +1,26 @@
+# utfcpp
+
+UTFCPP_VERSION := 3.2.5
+UTFCPP_URL := $(GITHUB)/nemtrif/utfcpp/archive/refs/tags/v$(UTFCPP_VERSION).tar.gz
+
+ifeq ($(call need_pkg,"utfcpp"),)
+PKGS_FOUND += utfcpp
+endif
+
+$(TARBALLS)/utfcpp-$(UTFCPP_VERSION).tar.gz:
+	$(call download_pkg,$(UTFCPP_URL),utfcpp)
+
+.sum-utfcpp: utfcpp-$(UTFCPP_VERSION).tar.gz
+
+utfcpp: utfcpp-$(UTFCPP_VERSION).tar.gz .sum-utfcpp
+	$(UNPACK)
+	$(MOVE)
+
+UTFCPP_CONF := -DUTF8_TESTS=OFF -DUTF8_SAMPLES=OFF
+
+.utfcpp: utfcpp toolchain.cmake
+	$(CMAKECLEAN)
+	$(HOSTVARS_CMAKE) $(CMAKE) $(UTFCPP_CONF)
+	+$(CMAKEBUILD)
+	$(CMAKEINSTALL)
+	touch $@



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/6661dbda26b71cf24a8a663e86fc5ea0f955c6f1...8126075bf9a56e6bbad88fa5ac407411168e0921

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/6661dbda26b71cf24a8a663e86fc5ea0f955c6f1...8126075bf9a56e6bbad88fa5ac407411168e0921
You're receiving this email because of your account on code.videolan.org. Manage all notifications: https://code.videolan.org/-/profile/notifications | Help: https://code.videolan.org/help