[vlc-commits] contrib: Bump libmicrodns to 0.1.2

[Hugo Beauzée-Luyssen]

vlc/vlc-3.0 | branch: master | Hugo Beauzée-Luyssen <hugo at beauzee.fr> | Fri Mar 20 10:25:57 2020 +0100| [feccd39955ca73ae2a9a9cfeba4fe0600deca646] | committer: Hugo Beauzée-Luyssen

contrib: Bump libmicrodns to 0.1.2

(cherry picked from commit 40148113cfa97fdfdf6bea7b9a7a05268528fde5)
Signed-off-by: Hugo Beauzée-Luyssen <hugo at beauzee.fr>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=feccd39955ca73ae2a9a9cfeba4fe0600deca646
---

 contrib/src/microdns/SHA512SUMS |  2 +-
 contrib/src/microdns/rules.mak  | 22 ++++++++++------------
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/contrib/src/microdns/SHA512SUMS b/contrib/src/microdns/SHA512SUMS
index d309a2162e..641fc10c8a 100644
--- a/contrib/src/microdns/SHA512SUMS
+++ b/contrib/src/microdns/SHA512SUMS
@@ -1 +1 @@
-47faa9d6342d3ae2b138009765a5a684e2c2474e53de15dc1deb88f87dbe558e79ab392f71971ee162eac3cf995f26ed35a74d6abfaf074dc1a249d042843954  microdns-0.0.10.tar.gz
+a6b15c65c74560fdba8973c63ffae9cdde4445f54196bb2d7d6348f6c15f8f162ef0a4e91b969ea3f2a60c701c3cc72799fcfba2fbf08c37f71ba8d5e3409702  microdns-0.1.2.tar.xz
diff --git a/contrib/src/microdns/rules.mak b/contrib/src/microdns/rules.mak
index 2870115543..3f86d27d31 100644
--- a/contrib/src/microdns/rules.mak
+++ b/contrib/src/microdns/rules.mak
@@ -1,30 +1,28 @@
 # libmicrodns
 
-LIBMICRODNS_VERSION := 0.0.10
-LIBMICRODNS_URL := https://github.com/videolabs/libmicrodns/releases/download/$(LIBMICRODNS_VERSION)/microdns-$(LIBMICRODNS_VERSION).tar.gz
+LIBMICRODNS_VERSION := 0.1.2
+LIBMICRODNS_URL := https://github.com/videolabs/libmicrodns/releases/download/$(LIBMICRODNS_VERSION)/microdns-$(LIBMICRODNS_VERSION).tar.xz
 
 ifndef HAVE_DARWIN_OS
 ifdef BUILD_NETWORK
 PKGS += microdns
 endif
 endif
-ifeq ($(call need_pkg,"microdns >= 0.0.1"),)
+ifeq ($(call need_pkg,"microdns >= 0.1.2"),)
 PKGS_FOUND += microdns
 endif
 
-$(TARBALLS)/microdns-$(LIBMICRODNS_VERSION).tar.gz:
+$(TARBALLS)/microdns-$(LIBMICRODNS_VERSION).tar.xz:
 	$(call download_pkg,$(LIBMICRODNS_URL),microdns)
 
-.sum-microdns: $(TARBALLS)/microdns-$(LIBMICRODNS_VERSION).tar.gz
+.sum-microdns: $(TARBALLS)/microdns-$(LIBMICRODNS_VERSION).tar.xz
 
-microdns: microdns-$(LIBMICRODNS_VERSION).tar.gz .sum-microdns
+microdns: microdns-$(LIBMICRODNS_VERSION).tar.xz .sum-microdns
 	$(UNPACK)
-	$(APPLY) $(SRC)/microdns/0001-build-fix-getifaddrs-detection.patch
-	$(APPLY) $(SRC)/microdns/0002-fix-dummy-mdns_list_interfaces.patch
 	$(MOVE)
 
-.microdns: microdns
-	$(RECONF)
-	cd $< && $(HOSTVARS) ./configure $(HOSTCONF)
-	cd $< && $(MAKE) install
+.microdns: microdns crossfile.meson
+	cd $< && rm -rf ./build
+	cd $< && $(HOSTVARS_MESON) $(MESON) build
+	cd $< && cd build && ninja install
 	touch $@