[vlc-commits] [Git][videolan/vlc][master] 2 commits: contrib: taglib: use github source for tarballs

[Jean-Baptiste Kempf (@jbk)]

Jean-Baptiste Kempf pushed to branch master at VideoLAN / VLC


Commits:
2d48800c by Steve Lhomme at 2024-03-09T20:43:53+00:00
contrib: taglib: use github source for tarballs

It probably has more uptime than taglib.org.
The hash is unchanged.

- - - - -
e896a2fc by Steve Lhomme at 2024-03-09T20:43:53+00:00
contrib: taglib: get utfcpp as a release tarball

It can be cached in our contrib/tarballs folder.
The hash corresponded to utfcpp 3.2.4.

- - - - -


2 changed files:

- contrib/src/taglib/SHA512SUMS
- contrib/src/taglib/rules.mak


Changes:

=====================================
contrib/src/taglib/SHA512SUMS
=====================================
@@ -1 +1,2 @@
 099d02b2eab033f5702a8cb03e70752d7523c6f8c2f3eebdd0bcd939eafbdca3f2a6c82452983904b5822cfa45f2707ed866c3419508df9d43bf5c0b3a476f6c  taglib-2.0.tar.gz
+1ce12c8158a2f3bcddec104ceacedaea4031b4c88fc0fa1f1fae8dfa8df81c846861df9d01e8f294d79b9e4ab8c51bd1289f404eed24d07abc760688fee13090  utfcpp-3.2.5.tar.gz


=====================================
contrib/src/taglib/rules.mak
=====================================
@@ -1,9 +1,10 @@
 # TagLib
 
 TAGLIB_VERSION := 2.0
-TAGLIB_URL := https://taglib.org/releases/taglib-$(TAGLIB_VERSION).tar.gz
-UTFCPP_GITURL := $(GITHUB)/nemtrif/utfcpp.git
-UTFCPP_GITVERSION := df857efc5bbc2aa84012d865f7d7e9cccdc08562
+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"),)
@@ -13,12 +14,20 @@ endif
 $(TARBALLS)/taglib-$(TAGLIB_VERSION).tar.gz:
 	$(call download_pkg,$(TAGLIB_URL),taglib)
 
-.sum-taglib: taglib-$(TAGLIB_VERSION).tar.gz
+$(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 $@
 
 taglib: taglib-$(TAGLIB_VERSION).tar.gz .sum-taglib
 	$(UNPACK)
-	cd $(UNPACK_DIR)/3rdparty && git clone -n $(UTFCPP_GITURL) utfcpp
-	cd $(UNPACK_DIR)/3rdparty/utfcpp && git checkout $(UTFCPP_GITVERSION)
+	$(MOVE)
+
+taglib/3rdparty/utfcpp: utfcpp-$(UTFCPP_VERSION).tar.gz .sum-utfcpp taglib
+	$(UNPACK)
 	$(MOVE)
 
 TAGLIB_CONF := -DBUILD_BINDINGS=OFF
@@ -27,7 +36,7 @@ TAGLIB_CONF += -DPLATFORM_WINRT=ON
 endif
 
 
-.taglib: taglib toolchain.cmake
+.taglib: taglib taglib/3rdparty/utfcpp toolchain.cmake
 	$(CMAKECLEAN)
 	$(HOSTVARS) $(CMAKE) $(TAGLIB_CONF)
 	+$(CMAKEBUILD)



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/1d9f62a8d79c5d89b619763f62ff0bac68d64ed3...e896a2fc5525407df7db7035e38990ba398a9e1b

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


VideoLAN code repository instance