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

[Steve Lhomme]

It makes sense. Did you check it builds fine everywhere ? If so LGTM.

On 2021-01-14 18:19, Konstantin Pavlov wrote:
> We build cddb --without-iconv so it's not needed anyway
> ---
>   contrib/src/cddb/AM_GNU_GETTEXT.patch | 32 ---------------------------
>   contrib/src/cddb/no-gettext.patch     | 13 +++++++++++
>   contrib/src/cddb/rules.mak            |  5 +----
>   3 files changed, 14 insertions(+), 36 deletions(-)
>   delete mode 100644 contrib/src/cddb/AM_GNU_GETTEXT.patch
>   create mode 100644 contrib/src/cddb/no-gettext.patch
> 
> diff --git a/contrib/src/cddb/AM_GNU_GETTEXT.patch b/contrib/src/cddb/AM_GNU_GETTEXT.patch
> deleted file mode 100644
> index d58eee3ae7..0000000000
> --- a/contrib/src/cddb/AM_GNU_GETTEXT.patch
> +++ /dev/null
> @@ -1,32 +0,0 @@
> -From 94db7a169628ae3031defd278211b96a1bc8893f Mon Sep 17 00:00:00 2001
> -From: Alexandre Janniaux <ajanni at videolabs.io>
> -Date: Fri, 8 Jan 2021 15:33:53 +0100
> -Subject: [PATCH] configure.ac: call AM_GNU_GETTEXT
> -
> -Fix failure when reconfiguring libcddb with:
> - - autoconf (GNU Autoconf) 2.70
> - - automake (GNU automake) 1.16.3
> - - /usr/bin/autopoint (GNU gettext-tools) 0.21
> - - libtool (GNU libtool) 2.4.6.42-b88ce-dirty
> -
> -> configure.ac: error: AM_GNU_GETTEXT_VERSION or
> -> AM_GNU_GETTEXT_REQUIRE_VERSION is used, but not AM_GNU_GETTEXT
> ----
> - configure.ac | 1 +
> - 1 file changed, 1 insertion(+)
> -
> -diff --git a/configure.ac b/configure.ac
> -index 9aa4984..a4a85bb 100644
> ---- a/configure.ac
> -+++ b/configure.ac
> -@@ -21,6 +21,7 @@ AC_SUBST(LIBCDDB_VERSION_NUM)
> -
> - dnl iconv uses gettext macros (dependency on config.rpath)
> - AM_GNU_GETTEXT_VERSION(0.14.4)
> -+AM_GNU_GETTEXT([external], [need-formatstring-macros])
> -
> - dnl Process custom command-line options
> - AC_ARG_ENABLE([loglevel],
> ---
> -2.30.0
> -
> 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 214cc51459..d1ba0e0549 100644
> --- a/contrib/src/cddb/rules.mak
> +++ b/contrib/src/cddb/rules.mak
> @@ -22,16 +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/AM_GNU_GETTEXT.patch
> +	$(APPLY) $(SRC)/cddb/no-gettext.patch
>   ifdef HAVE_WIN32
>   	$(APPLY) $(SRC)/cddb/win32-pkg.patch
>   endif
>   	$(MOVE)
>   
>   DEPS_cddb = regex $(DEPS_regex)
> -ifndef HAVE_WINSTORE
> -DEPS_cddb += gettext $(DEPS_gettext)
> -endif
>   
>   .cddb: cddb
>   	$(RECONF)
> -- 
> 2.29.2
> 
> _______________________________________________
> vlc-devel mailing list
> To unsubscribe or modify your subscription options:
> https://mailman.videolan.org/listinfo/vlc-devel
>