[vlc-devel] [PATCH 1/3] Add uchardet library v0.0.6

[pertuleha at gmail.com]

From: Aleksei Pertu <pertuleha at gmail.com>

---
 configure.ac                    | 10 ++++++++++
 contrib/src/uchardet/SHA512SUMS |  1 +
 contrib/src/uchardet/rules.mak  | 25 +++++++++++++++++++++++++
 3 files changed, 36 insertions(+)
 create mode 100644 contrib/src/uchardet/SHA512SUMS
 create mode 100644 contrib/src/uchardet/rules.mak

diff --git a/configure.ac b/configure.ac
index 76971c6e0a..bfd1010636 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3991,6 +3991,16 @@ AS_IF([test "${enable_skins2}" = "yes" && test "${enable_libtar}" != "no"], [
   ])
 ])
 
+dnl
+dnl  uchardet library for character encoding detection
+dnl
+AC_CHECK_HEADER([uchardet/uchardet.h], [ have_uchardet=yes ], [ have_uchardet=no ])
+AM_CONDITIONAL([HAVE_UCHARDET], [ test "${have_uchardet}" = "yes" ])
+if test "${have_uchardet}" = "yes"
+then
+ VLC_ADD_LIBS([uchardet], [-luchardet -lstdc++])
+fi
+
 dnl
 dnl  MacOS X gui module
 dnl
diff --git a/contrib/src/uchardet/SHA512SUMS b/contrib/src/uchardet/SHA512SUMS
new file mode 100644
index 0000000000..5cbb1c2697
--- /dev/null
+++ b/contrib/src/uchardet/SHA512SUMS
@@ -0,0 +1 @@
+eceeadae060bf277e298d709856609dde32921271140dc1fb0a33c7b6e1381033fc2960d616ebbd82c92815936864d2c0743b1b5ea1b7d4a200df87df80d6de5  uchardet-0.0.6.tar.xz
diff --git a/contrib/src/uchardet/rules.mak b/contrib/src/uchardet/rules.mak
new file mode 100644
index 0000000000..5dd302be3a
--- /dev/null
+++ b/contrib/src/uchardet/rules.mak
@@ -0,0 +1,25 @@
+# uchardet
+
+UCHARDET_VERSION := 0.0.6
+UCHARDET_URL := https://www.freedesktop.org/software/uchardet/releases/uchardet-$(UCHARDET_VERSION).tar.xz
+
+PKGS += uchardet
+ifeq ($(call need_pkg,"uchardet >= 0.0.6"),)
+PKGS_FOUND += uchardet
+endif
+
+$(TARBALLS)/uchardet-$(UCHARDET_VERSION).tar.xz:
+	$(call download_pkg,$(UCHARDET_URL),uchardet)
+
+.sum-uchardet: uchardet-$(UCHARDET_VERSION).tar.xz
+
+uchardet: uchardet-$(UCHARDET_VERSION).tar.xz .sum-uchardet
+	$(UNPACK)
+	$(MOVE)
+
+.uchardet: uchardet toolchain.cmake
+	cd $< && $(HOSTVARS_PIC) $(CMAKE) \
+		-DBUILD_SHARED_LIBS:BOOL=OFF \
+		.
+	cd $< && $(MAKE) install
+	touch $@
-- 
2.20.1