[vlc-commits] contrib: cddb: get rid of gettext dependency

[Konstantin Pavlov]

vlc/vlc-3.0 | branch: master | Konstantin Pavlov <thresh at videolan.org> | Thu Jan 14 20:19:02 2021 +0300| [9db5721b0e10f47eb93493aaa399c52a15e3d80b] | committer: Alexandre Janniaux

contrib: cddb: get rid of gettext dependency

We build cddb --without-iconv so it's not needed anyway

Signed-off-by: Alexandre Janniaux <ajanni at videolabs.io>

Cherry-picked from d0d4ca6aa0fe6fc73779b1fa261fde4f1009093f.

Signed-off-by: Alexandre Janniaux <ajanni at videolabs.io>

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

 contrib/src/cddb/no-gettext.patch | 13 +++++++++++++
 contrib/src/cddb/rules.mak        |  3 ++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/contrib/src/cddb/no-gettext.patch b/contrib/src/cddb/no-gettext.patch
new file mode 100644
index 0000000000..7770237e1a
--- /dev/null
+++ b/contrib/src/cddb/no-gettext.patch
@@ -0,0 +1,13 @@
+diff -urN cddb.bak/configure.ac cddb/configure.ac
+--- cddb.bak/configure.ac	2021-01-14 18:46:48.702409826 +0300
++++ cddb/configure.ac	2021-01-14 18:47:04.354533931 +0300
+@@ -19,9 +19,6 @@
+ LIBCDDB_VERSION_NUM=131
+ AC_SUBST(LIBCDDB_VERSION_NUM)
+ 
+-dnl iconv uses gettext macros (dependency on config.rpath)
+-AM_GNU_GETTEXT_VERSION(0.14.4)
+-
+ dnl Process custom command-line options
+ AC_ARG_ENABLE([loglevel],
+               AC_HELP_STRING([--enable-loglevel=LVL],
diff --git a/contrib/src/cddb/rules.mak b/contrib/src/cddb/rules.mak
index e317152812..6bef997f9d 100644
--- a/contrib/src/cddb/rules.mak
+++ b/contrib/src/cddb/rules.mak
@@ -22,12 +22,13 @@ cddb: libcddb-$(CDDB_VERSION).tar.bz2 .sum-cddb
 	$(APPLY) $(SRC)/cddb/getenv-crash.patch
 	$(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
 	$(MOVE)
 
-DEPS_cddb = regex $(DEPS_regex) gettext $(DEPS_gettext)
+DEPS_cddb = regex $(DEPS_regex)
 
 .cddb: cddb
 	$(RECONF)